From d607e386855e0d52a2344b88985f001bfb497f2b Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 13 Jul 2024 11:55:03 +0200 Subject: [PATCH 01/36] feat: ability to extract resources other than item from the interface --- CHANGELOG.md | 4 + .../platform/api/PlatformApi.java | 5 + .../platform/api/PlatformApiProxy.java | 11 ++ .../resource/FluidOperationResult.java | 8 + .../ResourceContainerInsertStrategy.java | 31 ++++ .../common/AbstractModInitializer.java | 6 + .../platform/common/Platform.java | 11 +- .../platform/common/PlatformApiImpl.java | 13 ++ .../platform/common/PlatformProxy.java | 16 +- .../screen/hint/FluidGridInsertionHint.java | 19 +-- .../screen/hint/ItemGridInsertionHint.java | 8 +- .../hint/SingleItemGridInsertionHint.java | 8 +- .../common/grid/view/FluidGridResource.java | 14 +- .../common/grid/view/ItemGridResource.java | 14 +- ...ucketPlayerInventoryInsertableStorage.java | 2 +- .../FluidStorageMonitorInsertionStrategy.java | 19 ++- .../common/support/AbstractBaseScreen.java | 30 ++-- .../AbstractResourceContainerMenu.java | 18 ++ .../support/containermenu/ResourceSlot.java | 17 ++ .../FluidResourceContainerInsertStrategy.java | 33 ++++ .../resource/FluidResourceFactory.java | 2 +- .../tooltip/MouseClientTooltipComponent.java | 154 ++++++++++++++++++ .../MouseWithIconClientTooltipComponent.java | 72 -------- .../assets/refinedstorage/textures/icons.png | Bin 5707 -> 5773 bytes .../platform/common/TestPlatform.java | 12 +- .../platform/fabric/PlatformImpl.java | 37 ++++- .../platform/neoforge/PlatformImpl.java | 23 ++- 27 files changed, 438 insertions(+), 149 deletions(-) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/FluidOperationResult.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceContainerInsertStrategy.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceContainerInsertStrategy.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/MouseClientTooltipComponent.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/MouseWithIconClientTooltipComponent.java diff --git a/CHANGELOG.md b/CHANGELOG.md index b9a5ca08a..b9e94576c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Added + +- Ability to extract fluids from the Interface using an empty bucket or other empty fluid container. + ## [2.0.0-milestone.4.4] - 2024-07-10 ## [2.0.0-milestone.4.3] - 2024-07-06 diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApi.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApi.java index 7a31b58f2..e7a00ae74 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApi.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApi.java @@ -35,6 +35,7 @@ import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemHelper; import com.refinedmods.refinedstorage.platform.api.support.registry.PlatformRegistry; import com.refinedmods.refinedstorage.platform.api.support.resource.RecipeModIngredientConverter; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainerInsertStrategy; import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceRendering; import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; @@ -132,6 +133,10 @@ GridInsertionStrategy createGridInsertionStrategy(AbstractContainerMenu containe void addGridInsertionStrategyFactory(GridInsertionStrategyFactory insertionStrategyFactory); + void addResourceContainerInsertStrategy(ResourceContainerInsertStrategy strategy); + + Collection getResourceContainerInsertStrategies(); + void addAlternativeGridInsertionHint(GridInsertionHint hint); GridInsertionHints getGridInsertionHints(); diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApiProxy.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApiProxy.java index 1d7b23193..76687e2f7 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApiProxy.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApiProxy.java @@ -35,6 +35,7 @@ import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemHelper; import com.refinedmods.refinedstorage.platform.api.support.registry.PlatformRegistry; import com.refinedmods.refinedstorage.platform.api.support.resource.RecipeModIngredientConverter; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainerInsertStrategy; import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceRendering; import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; @@ -230,6 +231,16 @@ public void addGridInsertionStrategyFactory(final GridInsertionStrategyFactory i ensureLoaded().addGridInsertionStrategyFactory(insertionStrategyFactory); } + @Override + public void addResourceContainerInsertStrategy(final ResourceContainerInsertStrategy strategy) { + ensureLoaded().addResourceContainerInsertStrategy(strategy); + } + + @Override + public Collection getResourceContainerInsertStrategies() { + return ensureLoaded().getResourceContainerInsertStrategies(); + } + @Override public void addAlternativeGridInsertionHint(final GridInsertionHint hint) { ensureLoaded().addAlternativeGridInsertionHint(hint); diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/FluidOperationResult.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/FluidOperationResult.java new file mode 100644 index 000000000..281930bcc --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/FluidOperationResult.java @@ -0,0 +1,8 @@ +package com.refinedmods.refinedstorage.platform.api.support.resource; + +import net.minecraft.world.item.ItemStack; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.4.5") +public record FluidOperationResult(ItemStack container, PlatformResourceKey fluid, long amount) { +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceContainerInsertStrategy.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceContainerInsertStrategy.java new file mode 100644 index 000000000..b3b86c41c --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceContainerInsertStrategy.java @@ -0,0 +1,31 @@ +package com.refinedmods.refinedstorage.platform.api.support.resource; + +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; + +import java.util.Optional; + +import net.minecraft.world.item.ItemStack; +import org.apiguardian.api.API; + +/** + * Defines how a resource can be extracted from a resource slot into a container. + * For fluids, this maps to how a fluid is inserted into a fluid container like a bucket. + */ +@API(status = API.Status.STABLE, since = "2.0.0-milestone.4.5") +public interface ResourceContainerInsertStrategy { + /** + * @param container the container to insert the resource into + * @param resourceAmount the resource to insert into the container + * @return the result of the insertion, if any. If no result is present, the next insertion strategy will be tried. + */ + Optional insert(ItemStack container, ResourceAmount resourceAmount); + + Optional getConversionInfo(ResourceKey resource); + + record InsertResult(ItemStack container, long inserted) { + } + + record ConversionInfo(ItemStack from, ItemStack to) { + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractModInitializer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractModInitializer.java index c16987a07..fe1d3361f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractModInitializer.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractModInitializer.java @@ -120,6 +120,7 @@ import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyLootItemFunction; import com.refinedmods.refinedstorage.platform.common.support.network.BaseNetworkNodeContainerBlockEntity; import com.refinedmods.refinedstorage.platform.common.support.network.component.PlatformStorageNetworkComponent; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceContainerInsertStrategy; import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceFactory; import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; @@ -218,6 +219,7 @@ protected final void initializePlatformApi() { registerStorageTypes(); registerResourceTypes(); registerAdditionalResourceFactories(); + registerResourceContainerInsertStrategies(); registerDestructorStrategyFactories(); registerConstructorStrategyFactories(); registerStorageMonitorInsertionStrategies(); @@ -254,6 +256,10 @@ private void registerAdditionalResourceFactories() { PlatformApi.INSTANCE.addResourceFactory(new FluidResourceFactory()); } + private void registerResourceContainerInsertStrategies() { + PlatformApi.INSTANCE.addResourceContainerInsertStrategy(new FluidResourceContainerInsertStrategy()); + } + private void registerDestructorStrategyFactories() { PlatformApi.INSTANCE.addDestructorStrategyFactory(new BlockBreakDestructorStrategyFactory()); PlatformApi.INSTANCE.addDestructorStrategyFactory(new FluidBreakDestructorStrategyFactory()); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Platform.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Platform.java index 86186925d..7262179d5 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Platform.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Platform.java @@ -3,7 +3,9 @@ import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.support.resource.FluidOperationResult; import com.refinedmods.refinedstorage.platform.common.support.containermenu.MenuOpener; import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferManager; import com.refinedmods.refinedstorage.platform.common.support.render.FluidRenderer; @@ -63,9 +65,11 @@ public interface Platform { FluidRenderer getFluidRenderer(); - Optional getContainedFluid(ItemStack stack); + Optional drainContainer(ItemStack container); - Optional convertToBucket(FluidResource fluidResource); + Optional fillContainer(ItemStack container, ResourceAmount resourceAmount); + + Optional getFilledBucket(FluidResource fluidResource); TransferManager createTransferManager(AbstractContainerMenu containerMenu); @@ -111,7 +115,4 @@ List processTooltipComponents( void sendPacketToServer(T packet); void sendPacketToClient(ServerPlayer player, T packet); - - record ContainedFluid(ItemStack remainderContainer, FluidResource fluid, long amount) { - } } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformApiImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformApiImpl.java index 8cf2c9d94..b5115a5d1 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformApiImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformApiImpl.java @@ -40,6 +40,7 @@ import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemHelper; import com.refinedmods.refinedstorage.platform.api.support.registry.PlatformRegistry; import com.refinedmods.refinedstorage.platform.api.support.resource.RecipeModIngredientConverter; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainerInsertStrategy; import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceRendering; import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; @@ -85,6 +86,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; @@ -169,6 +171,7 @@ public class PlatformApiImpl implements PlatformApi { private final PlatformRegistry slotReferenceFactoryRegistry = new PlatformRegistryImpl<>(); private final CompositeSlotReferenceProvider slotReferenceProvider = new CompositeSlotReferenceProvider(); private final PlatformRegistry permissionRegistry = new PlatformRegistryImpl<>(); + private final List resourceExtractStrategies = new ArrayList<>(); public PlatformApiImpl() { gridSynchronizerRegistry.register(createIdentifier("off"), NoopGridSynchronizer.INSTANCE); @@ -372,6 +375,16 @@ public void addGridInsertionStrategyFactory(final GridInsertionStrategyFactory i gridInsertionStrategyFactories.add(insertionStrategyFactory); } + @Override + public void addResourceContainerInsertStrategy(final ResourceContainerInsertStrategy strategy) { + resourceExtractStrategies.add(strategy); + } + + @Override + public Collection getResourceContainerInsertStrategies() { + return Collections.unmodifiableList(resourceExtractStrategies); + } + @Override public void addAlternativeGridInsertionHint(final GridInsertionHint hint) { gridInsertionHints.addAlternativeHint(hint); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformProxy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformProxy.java index 8c246f989..c6b922ace 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformProxy.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformProxy.java @@ -3,7 +3,9 @@ import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.support.resource.FluidOperationResult; import com.refinedmods.refinedstorage.platform.common.support.containermenu.MenuOpener; import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferManager; import com.refinedmods.refinedstorage.platform.common.support.render.FluidRenderer; @@ -100,13 +102,19 @@ public FluidRenderer getFluidRenderer() { } @Override - public Optional getContainedFluid(final ItemStack stack) { - return ensureLoaded().getContainedFluid(stack); + public Optional drainContainer(final ItemStack container) { + return ensureLoaded().drainContainer(container); } @Override - public Optional convertToBucket(final FluidResource fluidResource) { - return ensureLoaded().convertToBucket(fluidResource); + public Optional fillContainer(final ItemStack container, + final ResourceAmount resourceAmount) { + return ensureLoaded().fillContainer(container, resourceAmount); + } + + @Override + public Optional getFilledBucket(final FluidResource fluidResource) { + return ensureLoaded().getFilledBucket(fluidResource); } @Override diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/FluidGridInsertionHint.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/FluidGridInsertionHint.java index d267e4777..056e872f7 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/FluidGridInsertionHint.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/FluidGridInsertionHint.java @@ -1,9 +1,11 @@ package com.refinedmods.refinedstorage.platform.common.grid.screen.hint; import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHint; +import com.refinedmods.refinedstorage.platform.api.support.resource.FluidOperationResult; import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceRendering; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseWithIconClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseClientTooltipComponent; import java.util.Optional; @@ -13,18 +15,13 @@ public class FluidGridInsertionHint implements GridInsertionHint { @Override public Optional getHint(final ItemStack carried) { - return Platform.INSTANCE.getContainedFluid(carried).map(this::createComponent); + return Platform.INSTANCE.drainContainer(carried).map(this::createComponent); } - private MouseWithIconClientTooltipComponent createComponent(final Platform.ContainedFluid result) { - return new MouseWithIconClientTooltipComponent( - MouseWithIconClientTooltipComponent.Type.RIGHT, - (graphics, x, y) -> Platform.INSTANCE.getFluidRenderer().render( - graphics.pose(), - x, - y, - result.fluid() - ), + private ClientTooltipComponent createComponent(final FluidOperationResult result) { + return MouseClientTooltipComponent.fluid( + MouseClientTooltipComponent.Type.RIGHT, + (FluidResource) result.fluid(), result.amount() == Platform.INSTANCE.getBucketAmount() ? null : FluidResourceRendering.format(result.amount()) diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/ItemGridInsertionHint.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/ItemGridInsertionHint.java index 6ea5d5c47..fcc21730a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/ItemGridInsertionHint.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/ItemGridInsertionHint.java @@ -2,7 +2,7 @@ import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHint; import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseWithIconClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseClientTooltipComponent; import java.util.Optional; @@ -12,9 +12,9 @@ public class ItemGridInsertionHint implements GridInsertionHint { @Override public Optional getHint(final ItemStack carried) { - return Optional.of(new MouseWithIconClientTooltipComponent( - MouseWithIconClientTooltipComponent.Type.LEFT, - (graphics, x, y) -> graphics.renderItem(carried, x, y), + return Optional.of(MouseClientTooltipComponent.item( + MouseClientTooltipComponent.Type.LEFT, + carried, carried.getCount() == 1 ? null : AmountFormatting.format(carried.getCount()) )); } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/SingleItemGridInsertionHint.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/SingleItemGridInsertionHint.java index 1268a1ae3..f870bdb8e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/SingleItemGridInsertionHint.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/SingleItemGridInsertionHint.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.platform.common.grid.screen.hint; import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHint; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseWithIconClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseClientTooltipComponent; import java.util.Optional; @@ -11,9 +11,9 @@ public class SingleItemGridInsertionHint implements GridInsertionHint { @Override public Optional getHint(final ItemStack carried) { - return Optional.of(new MouseWithIconClientTooltipComponent( - MouseWithIconClientTooltipComponent.Type.RIGHT, - (graphics, x, y) -> graphics.renderItem(carried, x, y), + return Optional.of(MouseClientTooltipComponent.item( + MouseClientTooltipComponent.Type.RIGHT, + carried, null )); } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/FluidGridResource.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/FluidGridResource.java index ea8366815..c69511d5e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/FluidGridResource.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/FluidGridResource.java @@ -11,7 +11,7 @@ import com.refinedmods.refinedstorage.platform.common.Platform; import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceRendering; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseWithIconClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseClientTooltipComponent; import java.util.List; import java.util.Map; @@ -52,13 +52,11 @@ public int getRegistryId() { @Override public List getExtractionHints() { - return Platform.INSTANCE.convertToBucket(fluidResource).map( - bucket -> (ClientTooltipComponent) new MouseWithIconClientTooltipComponent( - MouseWithIconClientTooltipComponent.Type.LEFT, - (graphics, x, y) -> graphics.renderItem(bucket, x, y), - null - ) - ).stream().toList(); + return Platform.INSTANCE.getFilledBucket(fluidResource).map(bucket -> MouseClientTooltipComponent.item( + MouseClientTooltipComponent.Type.LEFT, + bucket, + null + )).stream().toList(); } @Nullable diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/ItemGridResource.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/ItemGridResource.java index 95db4aff2..1cc3ce84f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/ItemGridResource.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/ItemGridResource.java @@ -10,7 +10,7 @@ import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseWithIconClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseClientTooltipComponent; import java.util.List; import java.util.Map; @@ -71,14 +71,14 @@ public List getExtractionHints() { final long extractableAmount = Math.min(getAmount(), itemStack.getMaxStackSize()); final long halfExtractionAmount = extractableAmount == 1 ? 1 : extractableAmount / 2; return List.of( - new MouseWithIconClientTooltipComponent( - MouseWithIconClientTooltipComponent.Type.LEFT, - this::render, + MouseClientTooltipComponent.itemWithDecorations( + MouseClientTooltipComponent.Type.LEFT, + itemStack, extractableAmount == 1 ? null : AmountFormatting.format(extractableAmount) ), - new MouseWithIconClientTooltipComponent( - MouseWithIconClientTooltipComponent.Type.RIGHT, - this::render, + MouseClientTooltipComponent.itemWithDecorations( + MouseClientTooltipComponent.Type.RIGHT, + itemStack, halfExtractionAmount == 1 ? null : AmountFormatting.format(halfExtractionAmount) ) ); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/BucketPlayerInventoryInsertableStorage.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/BucketPlayerInventoryInsertableStorage.java index febd4abd6..d956c7d30 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/BucketPlayerInventoryInsertableStorage.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/BucketPlayerInventoryInsertableStorage.java @@ -37,7 +37,7 @@ public long insert(final ResourceKey resource, final long amount, final Action a if (amount != Platform.INSTANCE.getBucketAmount()) { return 0; } - return Platform.INSTANCE.convertToBucket(fluidResource).map( + return Platform.INSTANCE.getFilledBucket(fluidResource).map( filledBucketStack -> insert(filledBucketStack, amount, action, actor) ).orElse(0L); } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java index fb0e66347..dea78b2ba 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java @@ -7,6 +7,7 @@ import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorInsertionStrategy; +import com.refinedmods.refinedstorage.platform.api.support.resource.FluidOperationResult; import com.refinedmods.refinedstorage.platform.common.Platform; import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; @@ -27,16 +28,16 @@ public Optional insert( return Optional.empty(); } final StorageChannel fluidStorageChannel = network.getComponent(StorageNetworkComponent.class); - return Platform.INSTANCE.getContainedFluid(stack) + return Platform.INSTANCE.drainContainer(stack) .map(extracted -> tryInsert(actor, configuredFluidResource, extracted, fluidStorageChannel)) .map(extracted -> doInsert(actor, extracted, fluidStorageChannel)); } @Nullable - private Platform.ContainedFluid tryInsert(final Actor actor, - final FluidResource configuredResource, - final Platform.ContainedFluid result, - final StorageChannel storageChannel) { + private FluidOperationResult tryInsert(final Actor actor, + final FluidResource configuredResource, + final FluidOperationResult result, + final StorageChannel storageChannel) { if (!result.fluid().equals(configuredResource)) { return null; } @@ -51,14 +52,14 @@ private Platform.ContainedFluid tryInsert(final Actor actor, } private ItemStack doInsert(final Actor actor, - final Platform.ContainedFluid extracted, + final FluidOperationResult result, final StorageChannel storageChannel) { storageChannel.insert( - extracted.fluid(), - extracted.amount(), + result.fluid(), + result.amount(), Action.EXECUTE, actor ); - return extracted.remainderContainer(); + return result.container(); } } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseScreen.java index d4ae30e09..32e51cb6a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseScreen.java @@ -11,7 +11,7 @@ import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlot; import com.refinedmods.refinedstorage.platform.common.support.tooltip.HelpClientTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseWithIconClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseClientTooltipComponent; import com.refinedmods.refinedstorage.platform.common.support.tooltip.SmallTextClientTooltipComponent; import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeItemClientTooltipComponent; @@ -243,27 +243,23 @@ private List getResourceSlotHelpTooltip(final ItemStack } final List lines = new ArrayList<>(); resourceSlot.getPrimaryResourceFactory().create(carried).ifPresent(primaryResourceInstance -> lines.add( - new MouseWithIconClientTooltipComponent( - MouseWithIconClientTooltipComponent.Type.LEFT, - getResourceRendering(primaryResourceInstance.getResource()), + MouseClientTooltipComponent.resource( + MouseClientTooltipComponent.Type.LEFT, + primaryResourceInstance.getResource(), null ) )); for (final ResourceFactory alternativeResourceFactory : resourceSlot.getAlternativeResourceFactories()) { final var result = alternativeResourceFactory.create(carried); - result.ifPresent(alternativeResourceInstance -> lines.add(new MouseWithIconClientTooltipComponent( - MouseWithIconClientTooltipComponent.Type.RIGHT, - getResourceRendering(alternativeResourceInstance.getResource()), + result.ifPresent(alternativeResourceInstance -> lines.add(MouseClientTooltipComponent.resource( + MouseClientTooltipComponent.Type.RIGHT, + alternativeResourceInstance.getResource(), null ))); } return lines; } - public static MouseWithIconClientTooltipComponent.IconRenderer getResourceRendering(final ResourceKey resource) { - return (graphics, x, y) -> PlatformApi.INSTANCE.getResourceRendering(resource).render(resource, graphics, x, y); - } - private List getTooltipForResource(final ResourceKey resource, final ResourceSlot resourceSlot) { final List tooltip = PlatformApi.INSTANCE @@ -276,6 +272,18 @@ private List getTooltipForResource(final ResourceKey res if (!resourceSlot.isDisabled() && !resourceSlot.supportsItemSlotInteractions()) { tooltip.add(CLICK_TO_CLEAR); } + if (resourceSlot.supportsItemSlotInteractions()) { + PlatformApi.INSTANCE.getResourceContainerInsertStrategies() + .stream() + .flatMap(strategy -> strategy.getConversionInfo(resource).stream()) + .map(conversionInfo -> MouseClientTooltipComponent.itemConversion( + MouseClientTooltipComponent.Type.LEFT, + conversionInfo.from(), + conversionInfo.to(), + null + )) + .forEach(tooltip::add); + } return tooltip; } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractResourceContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractResourceContainerMenu.java index b6b5cf2a6..57e8225b0 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractResourceContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractResourceContainerMenu.java @@ -11,6 +11,7 @@ import javax.annotation.Nullable; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.ClickType; import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; @@ -118,4 +119,21 @@ public boolean canTakeItemForPickAll(final ItemStack stack, final Slot slot) { } return super.canTakeItemForPickAll(stack, slot); } + + @Override + public void clicked(final int id, final int dragType, final ClickType clickType, final Player p) { + final Slot slot = id >= 0 ? getSlot(id) : null; + if (slot instanceof ResourceSlot resourceSlot + && resourceSlot.supportsItemSlotInteractions() + && !resourceSlot.isEmpty() + && !getCarried().isEmpty() + ) { + final ItemStack result = resourceSlot.insertInto(getCarried()); + if (result != null) { + setCarried(result); + return; + } + } + super.clicked(id, dragType, clickType, p); + } } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceSlot.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceSlot.java index 67bf7ff4f..5a8837a7f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceSlot.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceSlot.java @@ -2,6 +2,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; @@ -216,4 +217,20 @@ public ResourceFactory getPrimaryResourceFactory() { public Set getAlternativeResourceFactories() { return resourceContainer.getAlternativeResourceFactories(); } + + @Nullable + public ItemStack insertInto(final ItemStack carried) { + final ResourceAmount currentResourceAmount = resourceContainer.get(getContainerSlot()); + if (currentResourceAmount == null) { + return null; + } + return PlatformApi.INSTANCE.getResourceContainerInsertStrategies().stream() + .flatMap(strategy -> strategy.insert(carried, currentResourceAmount).stream()) + .findFirst() + .map(result -> { + resourceContainer.shrink(getContainerSlot(), result.inserted()); + return result.container(); + }) + .orElse(null); + } } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceContainerInsertStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceContainerInsertStrategy.java new file mode 100644 index 000000000..5b43560c0 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceContainerInsertStrategy.java @@ -0,0 +1,33 @@ +package com.refinedmods.refinedstorage.platform.common.support.resource; + +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainerInsertStrategy; +import com.refinedmods.refinedstorage.platform.common.Platform; + +import java.util.Optional; + +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; + +public class FluidResourceContainerInsertStrategy implements ResourceContainerInsertStrategy { + private static final ItemStack EMPTY_BUCKET = new ItemStack(Items.BUCKET); + + @Override + public Optional insert(final ItemStack container, final ResourceAmount resourceAmount) { + return Platform.INSTANCE.fillContainer(container, resourceAmount).map( + result -> new InsertResult(result.container(), result.amount()) + ); + } + + @Override + public Optional getConversionInfo(final ResourceKey resource) { + if (!(resource instanceof FluidResource fluidResource)) { + return Optional.empty(); + } + return Platform.INSTANCE.getFilledBucket(fluidResource).map(filledBucket -> new ConversionInfo( + EMPTY_BUCKET, + filledBucket + )); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceFactory.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceFactory.java index f0ad2b9a3..cc5e30dc6 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceFactory.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceFactory.java @@ -12,7 +12,7 @@ public class FluidResourceFactory implements ResourceFactory { @Override public Optional create(final ItemStack stack) { - return Platform.INSTANCE.getContainedFluid(stack).map(result -> new ResourceAmount( + return Platform.INSTANCE.drainContainer(stack).map(result -> new ResourceAmount( result.fluid(), Platform.INSTANCE.getBucketAmount() )); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/MouseClientTooltipComponent.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/MouseClientTooltipComponent.java new file mode 100644 index 000000000..5b376ec91 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/MouseClientTooltipComponent.java @@ -0,0 +1,154 @@ +package com.refinedmods.refinedstorage.platform.common.support.tooltip; + +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.support.TextureIds; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; + +import javax.annotation.Nullable; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; +import net.minecraft.world.item.ItemStack; + +public class MouseClientTooltipComponent implements ClientTooltipComponent { + private static final int PADDING = 4; + + private final Type type; + private final IconRenderer iconRenderer; + @Nullable + private final String amount; + + private MouseClientTooltipComponent(final Type type, + final IconRenderer iconRenderer, + @Nullable final String amount) { + this.type = type; + this.iconRenderer = iconRenderer; + this.amount = amount; + } + + public static ClientTooltipComponent fluid(final Type type, + final FluidResource fluidResource, + @Nullable final String amount) { + return new MouseClientTooltipComponent( + type, + (graphics, x, y) -> Platform.INSTANCE.getFluidRenderer().render( + graphics.pose(), + x, + y, + fluidResource + ), + amount + ); + } + + public static ClientTooltipComponent item(final Type type, + final ItemStack stack, + @Nullable final String amount) { + return new MouseClientTooltipComponent( + type, + (graphics, x, y) -> graphics.renderItem(stack, x, y), + amount + ); + } + + public static ClientTooltipComponent itemWithDecorations(final Type type, + final ItemStack stack, + @Nullable final String amount) { + return new MouseClientTooltipComponent( + type, + (graphics, x, y) -> { + graphics.renderItem(stack, x, y); + graphics.renderItemDecorations(Minecraft.getInstance().font, stack, x, y); + }, + amount + ); + } + + public static ClientTooltipComponent itemConversion(final Type type, + final ItemStack from, + final ItemStack to, + @Nullable final String amount) { + return new MouseClientTooltipComponent( + type, + new IconRenderer() { + @Override + public void render(final GuiGraphics graphics, final int x, final int y) { + graphics.renderItem(from, x, y); + graphics.blit(TextureIds.ICONS, x + 16 + 2, y, 234, 133, 22, 15); + graphics.renderItem(to, x + 16 + 2 + 22 + 2, y); + } + + @Override + public int getWidth() { + return 16 + 2 + 22 + 2 + 16; + } + }, + amount + ); + } + + public static ClientTooltipComponent resource(final Type type, + final ResourceKey resource, + @Nullable final String amount) { + return new MouseClientTooltipComponent( + type, + (graphics, x, y) -> PlatformApi.INSTANCE.getResourceRendering(resource).render(resource, graphics, x, y), + amount + ); + } + + @Override + public int getHeight() { + return 18; + } + + @Override + public int getWidth(final Font font) { + return 9 + PADDING + iconRenderer.getWidth(); + } + + @Override + public void renderImage(final Font font, final int x, final int y, final GuiGraphics graphics) { + graphics.blit(TextureIds.ICONS, x + type.leftPad, y, type.x, type.y, type.width, type.height); + iconRenderer.render(graphics, x + 9 + PADDING, y); + if (amount != null) { + final PoseStack poseStack = graphics.pose(); + poseStack.pushPose(); + poseStack.translate(0.0F, 0.0F, 200.0F); + graphics.drawString(font, amount, x + 9 + PADDING + 16 - font.width(amount), y + 9, 16777215, true); + poseStack.popPose(); + } + } + + private interface IconRenderer { + void render(GuiGraphics graphics, int x, int y); + + default int getWidth() { + return 16; + } + } + + public enum Type { + LEFT(247, 0, 180, 9, 13), + RIGHT(238, 2, 180, 9, 13); + + private final int x; + private final int leftPad; + private final int y; + private final int width; + private final int height; + + Type(final int x, final int leftPad, final int y, final int width, final int height) { + this.x = x; + this.leftPad = leftPad; + this.y = y; + this.width = width; + this.height = height; + } + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/MouseWithIconClientTooltipComponent.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/MouseWithIconClientTooltipComponent.java deleted file mode 100644 index 379f8f341..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/MouseWithIconClientTooltipComponent.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.refinedmods.refinedstorage.platform.common.support.tooltip; - -import com.refinedmods.refinedstorage.platform.common.support.TextureIds; - -import javax.annotation.Nullable; - -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.gui.Font; -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; - -public class MouseWithIconClientTooltipComponent implements ClientTooltipComponent { - private final Type type; - private final IconRenderer iconRenderer; - @Nullable - private final String amount; - - public MouseWithIconClientTooltipComponent(final Type type, - final IconRenderer iconRenderer, - @Nullable final String amount) { - this.type = type; - this.iconRenderer = iconRenderer; - this.amount = amount; - } - - @Override - public int getHeight() { - return 18; - } - - @Override - public int getWidth(final Font font) { - return 9 + 4 + 18; - } - - @Override - public void renderImage(final Font font, final int x, final int y, final GuiGraphics graphics) { - graphics.blit(TextureIds.ICONS, x + type.leftPad, y, type.x, type.y, type.width, type.height); - iconRenderer.render(graphics, x + 9 + 4, y); - if (amount != null) { - final PoseStack poseStack = graphics.pose(); - poseStack.pushPose(); - poseStack.translate(0.0F, 0.0F, 200.0F); - graphics.drawString(font, amount, x + 9 + 4 + 16 - font.width(amount), y + 9, 16777215, true); - poseStack.popPose(); - } - } - - @FunctionalInterface - public interface IconRenderer { - void render(GuiGraphics graphics, int x, int y); - } - - public enum Type { - LEFT(247, 0, 180, 9, 13), - RIGHT(238, 2, 180, 9, 13); - - private final int x; - private final int leftPad; - private final int y; - private final int width; - private final int height; - - Type(final int x, final int leftPad, final int y, final int width, final int height) { - this.x = x; - this.leftPad = leftPad; - this.y = y; - this.width = width; - this.height = height; - } - } -} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/icons.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/icons.png index 39ec1ea0059749e66f7bddb13193b2d2e564b548..280fe562758fabc00642db9b81315ad04b7368a9 100644 GIT binary patch literal 5773 zcmYjVc|26#`#;x=LH1+`8Dz_@Wa+~gTSfMSvJIluk}cV0RAeinP$^VGkz^TLWE?>*1G&wZbBp7T8Cd7mfA&gK~JF7aIe0A7pZW)1*A za1#QYDEQ$PT{(uGKIb&;M04mbBx4hV4nJeh{=@0<;n*Usou#zPK z01;UWGh@dHkGaRzGxE-7+80Q!yMH_=*76HAvkTHzw~~`REqB3q4=jAf3HW__M7Pnj z5#lm)E||+2`|+WhfIRYOP-*;VL8i90w|BdM{O#i+34W>e=Xmxe)=^#88i}+cYq>8& zUj7_Ai6)_QF{g@pT*DU1BA+bTpW49;gFR;(>KejQUQJ$Jy6?mrpfcjE__f@V*0|Wr z9Z)7wk_KVzFCrq=y@*+z=$OW?bCP-9fEY*%zce>ed&MVYX{!6oz=4svkfIB~`L&xx z@S|7G{+smJab!pKdeKco%>Ut)PtVV5(O~Z6_fIc4jZQZdT zd9NqerXD0fiM7KKKTC=pqVg3rzK^HZA6PL9%~%uk@GPZlPpoOhHKEd#A6DqKuL}jY zEiCBn2~10a?#)5DAzg=q9hS{@kroGhTrC0)a|;gF;m0objMi$jy2Z}^x~$S!roh;j z&2QL*|F&wZzS`7G?6BQdUENwqT4PMqH>KdWC)-UWe?V38Xu+$l4&o?jrXmAxwE0nO zgf)3R{66q=Ei63Q6PNc(dO#)0ck zT5rWJ7IY(MoB1l;ru9R4dD}fx66emny9JDvB+>$|2xEJiu(K7WKmO<{!Sam$Qf}XkEHEKue$=%c5F_qn%VCEdBbg4r*7P-U4Z0T zYCce;D6qlf@S;=L{L>LCGI(6Zs<@xnsrcpR@N+X>EVF}z_gQ*HTAdA0%L|$A@t2B_ zwk2mZG1C4i7-qULTtB_oHK4fmH1JUB9>H}+xL*2hBOTKy*`WW1XbVGGTsTZvn(hr` zO_lGwbv_~MRvYBCv_75JP#taA?)q=8gSPw4j|IG1ak=xgfwEcmd^QS~v4_*9LT+JRt{}lr>pn{#dE7 zA2e-0wjFV({O7@k;RV`o?&B5R?LI~fS5jel#Qg$BBum}1Y2+GT#~zY2BSu1SK=9&< z|8K794V?pJs6~pXMs4A~Iz>ij9_y~LJF|}wEVC&ZqU@v{(;Af;p^s0)Y@Bx&nGhSl zn({6xBdAddJ2Cm7AfjLyr+)#Cye?>$3e2h&D z4@h>9ASeGgNbos10xUg2p)H`H5kV=Z9o4p#NW< ze2JB?QwMlIy;}v0!o3qq(>>2^+1JN@56TyAp_F3S|ld4}DFbZ}HI0{tZuGI_+|R z0$qgv_`1{?#j|XQ_{b_7w%3nkUKCvk{?yy4=aX=M!|-zB;kdeOzDr)Ah;*T{PGR=0 z7k9Ql#$br;ZOFsETfL>Uma_2O2ccFY>!Z4a8X-es3Kp}F-fPgY@T$4rSB0g%Ke4T2 zo)3HN&Os#S zX)3&QFx`S|B}>{l@Gn5BlMS^PDq2EzjIM2#j-1EOms~io%|kED_7E@RAU6O3vzr$) zRRYY-{C6bYj6}SjfCFmb@spU@84Y- zYnBV7o!EV7ZQvPQQ_5XZ^txP2UoDPW5q4N-7m{PzuRQPNt}zz#tEE5O)c+ zh?lAkPbRxcur*j)ODjs*^x98>txWazN5(xxc{pD5&X|IKS0$0HMz&i^IVr6}Nya%+ ziV|$a4?_1Q1rS%X17^+2#)MYfk2r|@7DSUh74+%Xue*hk)XjYH+#DMmkPQ)ot4Jc zB^2}9&K5ms-5j+xuht6kbu%>y!f;Sc#j+)Mki|IfofSvDX;!~?aBacUbW6S0myJ=# zOR&HagezST6jwV|nG&IJalT=Js&*~!xoRIUTU>=?EpmYB?XRBrck}IQ*3IKnz;TQ9 zmR`>N5ponDb%pGeiJg(8+KKcdIJrhlY(Z9Yc*Ay!*6vIKQ1SbO!lv+3dd8zb4#4J~ z;(>;y*a7w9Q=a@+)e8^hkS-D_vrwxQU?3#lzLz09Bv>b+>FI4fP$JzwxDDXwVe|)h ze2#8Rx#zXS4mG}~5nV242!-f2RbG^f2v7cEB~uJL2zy@}JQJL7F9fhT3D69FM(LXC zOBIgv!SL>32lu^v6xs`wG%al@Du*dS@D`BOtec?RZ}>TQym2ySO)&W!r=7iKtb-}= zAKezA*@k@wk#QDdSwBArnHjk{OPR(Ccg5GlEE~Q)2typxSlgSazXBYOJ5fXi)rW_I zOGHx^Ox7lxD!JM|BZ`&8Z255}Gv`viyBF7b*U`Bt2bYWf^U@b z{L6D8sS%Mtn0=xn_r_0zA-EA+<1!YXtdezA>#zQvFtnGAAwk{jyzJ`hkyE{XsS(6l zUHQNNG_r=o&!uelo|fRq-uJ%!^}aUNRp+RJhNsf2vK|=_Pa7-NzwT8m*0S+S()bp>l_jR zT*UMh>>ACB8}ivte-@B7`$5Ccr5YlGULCIZMo`P!MkAq|Lmk?npi9he2allsaS55& zY|&Js8i`zERXTKXb}WoI-PWGlxWMCIcTVT5-yKJwkxu%59l5p!^!^#a1J z3%}i7GW$@JT5jp5R@Umzjf*{0>(Z5|cER1|cWZN91gpjW73<*0Ir1(5F}2HNcJo?l z#`Q`C@Fp~JFV>Pf;O>U(#oL!sG!DcX-@(sP%evcAMBTZ_!TJ{bWJM7pxcj!-IlvHd zIimOjVz!PKx@D>i?H~U#nSA}`&-f1}%#O8bq{Awtsi@G8I4*ORFRNzGy+WoH`70>D z7Xw~=h=T^QY%+(dimZ_ZE}im6ziuWg9aeWNU(jNIEF|`ppKt(XR>5~SJN<{AneYiF zuPoIt#l#;am*q)FnA}2SYk2mseu0y|8mVsf8&Ac>J;eoyi6do4Kj}kdT{p0QEf68a z{zRapl0{Y0B>cY-L;kmY5dmhnP?`cr&JYwrjMIJbKQ*C54S(=X3YjdEdHz7>DGow& zsvl6k{6J>GG6#^g6ER%pv;AMHnA=^sWGIojTcg$c*FlilQfvz1oG(CArpxxYhRY}2 zOV~@E8A1}7Lg?g*E}+Txj1NMVebtdX-$G4MLy+}SF~~QXk|0Ot*j~2thMlG@aXMQ} z${(ap2_SqB%~vIuyp|2&B<~#gt0;90%{JgW$MrrkwI;$HMYtkX#*sfhZ+V8u$3}Si z(Ic^u$I)|7woGs5b4NuRQ|B0WVxkF$an|`^oH%wpvuOP* zt4xtr{!2&AhB-uI2>}u@oSF%QTaswdCm_TrPRN)2wI3t#Pdg^q2g-j`nOqEU$~HEQ ze;&|U{pJKYr6gAKt8al(ov15}HGu1p-1Nupn{_SKs#*mAciM%)-8BO(Vm8!!1orZeL^c_EYQ9Z0YtBt){4AUyU*n_jL@li94U zU{e6;J=~(|m*uxvqD^l+`3i4H5fTFu2jr-`oPRXXC`};$QF-ioSD6JTALJM+JK*-I zhD*o%qXWk$L~7T>ReX~TCJG_e_mjKC@9rgKQzKE(Iw(P?s&5*wB(|?EQB;6fUb}$w zSvE`O6S)^fN>)_sRv_uylNMx`I$PJr_afl$fwAAwKPQDABONQwe7bl-)mKZaBh}=C zHb%H4PXYmMh1#%fwBF3Uo=g=tN6QRHfEimSe(ZT6DYZl7<@JqQ=o*EBY7R}unZgMu z>-}m2Z8W^_5*pw5!}6=qx*RKY(T% ztVK{~ysAC<)4ByjRNIODLt)^{3oQ>0h z2nlMDqXoVdC3s?;Go+d%3z=sWdmapz7N{SIM(LQK0*ZnquObWcs z_yW5pR0}eu>Va8u93cM?8wEGhDS}4iWxZsG(`hjgje7`_&E%l6h?DJ$rV|i76d46% zzt{yo`iHB{GWZdMlZ8QRhAJjsnsc=cOumH3NWCFR0CKY^H;ml*5yF9Yuk90~e$?{d zurdGWwdx+sgPi*Kb4U8U9W#pUza2(FAny{m{*Y|fBNe@vst*WBi))Y9M^>zUB42~S)l1fXW_&9{pGT?v9U*lWX}(w4QNqqLeqG5y?f^=>t<>P5|@-H zkQXtY6uCaU#(LM|>u#>xRqvi{I?Q5jlFDr^vW0oYC*w))n&*o`_yDkJA$sh%62DB= zO+R^M?lvvupkTrpTFVW*oT*Nt&1D~P_&Tq69>lnMlnmc@>zBK{Ju-$Mk5EL8m<{X9 zvAcwF(w)|rVb2T+eWQVJDAVsdd+0B@hM&&nmxLBD%z_U%#reC4Gm&iXv64E8nG z@$J`>FKezdz0_tRJhDiuw4KjNCq`F${#nqj=~qdpsec>-gHa|{(jcWa(KKs{Jg1ZGB($?G@wroXESSvD#A#S_Xv2^w;`l9zM;cT+^T9@XNG0+ zz;m-bpIh#8m3Sm)kodNdk0)e`-(zd(DAD6?MLnmx-|z1X-1lbwEjz=16(`ne^oVCZ zI}vLkX`IWU-$&lqP)?U7&dnJ_1(H;HcE9?E7eSBt?f!(D(GcCvD8ch%t;qN{=Xi1u zAV;e2jIM(`OZgwwg}dU~JlJ_sk(~23!EV$pxF4dY`^RsE+>_fZPa79|$B|E5_~qYd zw--p-U0AN2^C>j$T;)g-$D%7NQ>zx6=+z$s5QOjmT9aX9{gsLKslLJ!Z#RdKfA;EP zjVX1gD|~M1)n6?=S?WoOCJ-j(sjwnb?V>N|0lPah0_2)6B~Po>@b2{devUr}I{~3U zs}T{cU4yR^3c@a|Krbv>Kz-|c`R4oZ!;rJ%{@F9sYJQ-%?~@Ec-noj3lp`9lMIyjw znNAQaaCbAo>+7~ZjGO=+pUus1TS1tFnf^_jV+cT4w`)8+6$YDZY?!clEG}(DI^BRv zsd07aQU>o1EzX>5nla1^_TYl}^F_24ZouRPPF5;+@?!V_m^#q{yorn6ou?qegSWas z<$Qx={q3UvLN+augL~8Y9JssRKqU)w!37xPVsT_Nkl7x3%3JB`cWAFcto(g7$o6!1d&$mU*6h%ga^11E(@*SSEdZ3}pz z9Lp{Q#IoTd(`-Y5bGUglT#!h&duMk#m2!^rK12?Bnn}>AHyfzg2O+FdR1wF8gNmPE zY<@Xae(J~=RR*cpx6owGSWQ!+=NOu@#_M+F;O;|mQlJ^m8FxOH5yJF+c>-sT=eED7 zp~J~V`Z10lYbItH5TY0}aSt9^dh0hl|Ld{pChzRiupX=p+{^BCeoUj8mJ<4-@26n~P#TJ0NbaD1YK|U`U?sPr^0Ezd% zUPxzH`6U2$k0XxTo{jcfqPfoQ_w*pGY%V-Go|~i?;CKQicw*9DCdo-2k#I-nLE(65 zyV{p$ChbpAIa>B=En?`V^;4dqLYjReUmT@P#GV!xNz2CWI{p2@rHlQkXyq%ret!@% zR1wvCsBF2lX@2a*EyfU@AskA^NA*^2GV)u_)sEG=9)sIbzS64md`oa&v%Mq2y|2A~ zTI1W=7&BLrO+8~W=L&(Jz6pumINg*rmu@raazz<`287aDemoiVB__m2Om?K1*SS*( z@vY~OUC-U5@75rBUsbomWZAVMJHyS#NL# z_oqHKns+>Om9?pq+(an@S$iS*5o^XV?(1oCMD_<+@1W4bDVmh##F3C5U!J9O1ZTOc z%Ols@dDY5fZ%aJyE(IGm%+eyz66OQy7)X3HUX{Gz!|rtrwVb#F>l=#8q@rDn#V|kV zA9$Q~cN6k^*+jw!+qSlM?C+@l-rED*ZkOPFA;b^Z#;|u{JkCO8*y=nJ!M)ZcMXcVw z^ngAz;0KY~(Xw8Bo*tsI(~hN$S{e;-7pFE&=$2-4@ghIPiJYnFZ+Ol#??0Zq>eO>K z=e<`qT%3}+)0SEd_OF`ah*615ERnF?k7VmMWijgTtchv1g39%iK?yB?FvFVFi8Suht2B2j@zbiSMNMC; zLya9*TSv@AS*b9)blahzh{|X6=>|}<6%p~J4fNVQ=1yZpAVi9{E*XYSm^4Z3Huzx? zwM?BZ!mi2;&nxkYPu@_%=dq6kxyue`vx>s>_UIy}Iw|jOXKmH}wl`@!;#VIDeSY*~ zgBL&#-iEkMA#PXt#mZd!=iR-pSMc%EPgWnNHi<@jDV~!#Ab~CxncCIK(eN(`p`|6DZ7w&x#(w7O&`I_$gVm!wVAu;oUy<-Xhh zKSeJZK-^}mYHRa!xY1y%DwUp}zkX<^WRfMe|0I3toc-hmr}f6%nVDGAKUc+*7_GAH zrvhuk@($ILn_L>?F((M&?O&Is2uZFyw(Bm%ci9iKC13F_p1O=HbzN1_@Eap`swTem zQ;2vl74^F9M5ZZKq;O@rlwh{%*mB=wb&QUy^K#p->)Ug zVNw(hwUop~F~(?b*Lp1EF!tJ*e6L`OzmNTxsnr&AcNMxWW9Z(wKz9@;u^2?g&{Q+O z?sWTI;U%QNXJL}fk^F$bxS#+_F7?QqyLzv;N^5-<8ID6{dguDEWplHiT+j)R{su+S z*NYH_C+zXWjxQ?>xXuu9&#TgXQ_D)}lj8E2zPyG~lkn7;T2YkjMTx1H`zjGvWjYVC zN<^Id{UCv{xS>^{&)7k&+r)f3WTjc#pQ~P!f->sR#&(8v-Ngh?%ZFjL;8R}l*J`mE zd&QWq(;hJDVnNnSQM{c4W(r?0gu?`z6we0b$IZ^1H4PBd+lU#C_J&O}&8t4n3c|+% z(V^$UX#*pj)R}9+KKezaUlPCUSW^AV+@#gE%YxRSeN4yRC405>s80a}lWT(?24nKr zzW3DRRaueX$KEL^wRNqvj^4ZY4?BbstuXxp8!;mnVGCiDjlQmGzHX-EtArfZ9z|rb zi@*As8RMe9HFF7k)-A~K5$`P_?dSXAS#4ro-9f>FJO3!ifr7-Y8D!o+3&bj@Tc4&( zVPS&}@4E*Q+`qsQ4%88YpSKqy^}E`%ZU1~PNz0Av)&+Vhc0*#jY&%~uH^ZDD;jizy z0hlUDC{~C*Z~pry1j+dknU|vj?nsXR?X_Cz#h>|X28-hKc70F-4w>}?elb5DpLPUn zd0?Aa-q<`?ty!^@DDXrn-SQA&%b&qyul15Qr40c0o^t51r1i~7bVTJ{b^_O^G)<5D zaAD9Bxio0KHGbFJ+6%C!UN5vb*;MZ+;$Ca_SvS^plv)dA?RUWFai`V2K#0s}%-<44 zAKMN5{X=d)j-gQJhxXoXb4h`pvV6!;n*nSS-%mze#DmHb&h%Lpd;yY?(*zTd@T1cmR*HpUj_5wG@>1P99c8@a-COu(gedJJ=A#>~ zJMZ;I?hUVmblm~(GtiG^Xa3}JSmL^17A+%)`k1VMX(mGKZAfxbSx3{LFW;$W<+9dl zrHOgdx$w9-Cv}r8N*$E$SS+LMmg`tqg@ZgmM8`rN9Zd#LroWodtFSBa zd0tdA;F6H&x7B?o0_>iM>i60ALDC9qJn+mB6v3MIh@x~GDNCwp-%LeCs)nD5gV?x2 z+QbPU2T=>%jRoi#L5#8YS;*`tCF-drZ0OHx`!HVosJ$JZVhQWhKq+-eE_yGT@eNa` zSAmd?aKZLk=i3bq`?G^(Xk^AjY{z#|ubnerzUyEvp9W&c6jz82YlrNijBEi_6XpP1 zOoJBkik>@DF3`;2J&gQJ{73boh}mzUw5)q-iPjbM*LqB zX0UR(RQ!NCW|_vZBGBi1AUhCTkawkpYld}WO;D!pZLB0;x+W8};W@+H) zqYyjq>#fwGV~-Q+whrF12|etsQy>j5L0Rs@h<@vo&x`yvmF#j4j~VJ)l1%H|Ic}5M zY1AYQ_k?yY{jyF`pZFbeR;(jEM&gB}Be-wfI9#8iW|map2(hMvpdNFAyGyDlS% zjTH+7?frf`BdkL3%g)Ajf4<8$KHIqWaza*`q%Fi$#Q+vs=Lq4CUX>3udRi+*hOK?X z-fASQ2E^2hy!m)a4xlbxPlm5p*;&C10$s2`y#&c?P-01u42Jx%0+F0Wo|=f^6|6pZ zR%!T!%M+^l6;~PwCI)*FXQ66r%A(N>z}&-K$}Wyd`Hinl(BAJkiVr~ z9c_|$!Kd$Kd^iW=#>=k@+g4O67s5fo(kgXwsbX# zc{C?!lqROc;ko=Bc^Y)`j$4)Ue#dN<*6FK0cvE}T(sSp-W`gaEu{Rve{{i-6aPbdDu6<5F%n!;Z8{ZdC}sasY^61*M)X7W zLC|&(mi!18sQdM%u-kB;AY9hFCnL%@85sWdO%Jm47Jai!#3gj;O2C;32mOv7fjyn& zSa1jb9l9pnCO6ze@rb&r9)Cj<6>xpR{&1uU$<)ybCN)~S6keFNq>v|U`0$$~L|;M} z6J+s89mB*0&GH4Rs=0i@-M!G^7+!dxi_RGS7pnsGQkDSy5kKvLMeRPw`G-L%mBO%$b9XmBkJijqanpjRagV7`mYd-{~6y?o=N^(xR|m~v*E*|kWP ze3xWu*t$LDuuSwPCZt$g9uy&lwYNhS_iR2=5?6Dn2O@~Kgs!r>04mlSX83AETOm;r zM0C&vfZG=%e&SS#|97w#3=?Gb0jm*@+TTypS%Yr~E8x5HvXolZPdUiA;XD-8+nD|+ z z;jBwftTn9+YqS~MGqkuXf~Ze^$YS{v>NBJDYmf&Pdf*j#16RF1Hf*ipC`j5;#DXG? z!WQO-ijNu%_{S7gcGrn7&1hP1c zu-4JRbnDR@4Z*63aYn4E2?hk!b3O4loi2m^PVOpw;Riv5J=QzWKOu;Lb>wd70^hFM zuBYF_6a_JK9HX@P0iAyYw26fDO?mppKc4|W9~lhUvtz7`oP=~<-rVxV0*$#~c;=oQ zNd!AaSb_@Q+PJt1XcNRbv z`IgMf^hS+GXW&4&mk;{>l6g8MTsosB2p|4Sd;50KRVz`Qq+p!Mk39*2mY7M=hd}eR z{Z|@QS5EIMZ5K*|zj-V-1bn@jBKC23x&@Mhx%*TAg!>eUC$=0EIzTuvJwx((ZO>LV zeJqC^k?hh{%XvM>v&|^liiQ50)ny;_8UVW#lAE@qP24*(fYKnWS|DBi2tiN}=Tbe- zKunqB=s5I)hHq1@2GD>xeXw8lkp{*%qnNivoEquTCBzoSo7NvVkFAc

*=ThtOHUGC{|bh|gSc9=D1DGbI<37lzqb91SJ zUv$x_iCgoJZf1T$vTm=XQ7(OANU}=O*Bdrv^+EjR+wV=4%{7P+9`&1mp-Br?BB<5n z1muYd^v%a33G`W!!u6kdQ=N)$nWMql+ydVxm*bbw8#?24Cl+p|Ny8g@RMlrW{8c<9 z51FG6`j9;|ZHDa9XD)Mt>D%~@mI2B#wYmRIwV&bWPGo_A&fgfm9De^tEs?w9!5lDZ zcz@$*B6}NIUB*R!M>3}p@(&G}%xR)}#$tDMj;R<5X6A%O_U^Oc;zC1_-ubNUN4H3IczgpA~-biDNIs%z0~$?wYUzB_nNb-Qi{hF2yweQf@C!JGcy zfbZ(Py#afA88@8p^a_!}NPg`fUv?U7S#5{rrfkt}bgWb)O2U&di5GkKmOZ(wUl9o>f&=BiHrJ}8c{$cD-kzTtUWR!;N|g9M#a*a2eVz{17c5xDet~;2R_7k7 zMDo0T6gu}DlQ97Cndkg3NiwwG*1T?l1V$|kRez&wERanU4*6xZ)~1mBAU|aXT&HVb zPbfEYYDH@o7SUir^L%>IX>hceQ?Z&IV7F4og1Mbqmm)1!xZ{SFw-W5af0o15rAJkER zbVGADMmcjTq5Wky7Y#lK$$=4zvZLg9*YdFP=4BwJ6b}O^>tsgSwwdA37nbq(NC^qs zBIQ&AlM8#ha^Lwrk3q^L+2^(@0l{4=kO9OOMmrxfe_)jAJ;ZZF04a{&k43$=UJ<_F z%fNZaOHuTUJ#sSW7kkzh*u_RLf09-Q1xfVhl*_uXgh~rYPFoKSb75CVgb5_4xd#eR z&F133J`vUYN&-SX0L0tX`N#=@1)=h!cSptGf#tn@s;0>@7NZ7OK!SZr$E;)ForM&o zw^1|NZScgMVA6r#m11suLJEw%x%S>5?PtVzk&c>ZZyIArf_p9XVkRI1h{GVEiJ9Hu+_P?&q}f`q>B z<0Dwk8)Vz9b6PEr?uONx4`g(WIQHBZ$Q|~q@u?th(|MFyfs$HgN>ECZDePYeqNq-o zlq!6bL9X$Qh?s1SXGL1wOni27^LvARzDNiMhvHuhRpBgdtfW`=o%%AC_hSR_T6Wb zF%MyE$|Xgad8G^5?%>B#8qhaW9N_#ZXPb`l)4~{dNYe4<`pf|KB@xGh5<4%xV$M zGM?O&d3nexfjsS@t)wV99)a6ov|}e2qNoQA9L1MGueTFzXNK!#zW*c7zW@dZhf~LE I>`-_913HEfKL7v# diff --git a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/TestPlatform.java b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/TestPlatform.java index 5aa7118d1..199ec9da4 100644 --- a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/TestPlatform.java +++ b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/TestPlatform.java @@ -3,7 +3,9 @@ import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.support.resource.FluidOperationResult; import com.refinedmods.refinedstorage.platform.common.support.containermenu.MenuOpener; import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferManager; import com.refinedmods.refinedstorage.platform.common.support.render.FluidRenderer; @@ -95,12 +97,18 @@ public FluidRenderer getFluidRenderer() { } @Override - public Optional getContainedFluid(final ItemStack stack) { + public Optional drainContainer(final ItemStack container) { throw new UnsupportedOperationException(); } @Override - public Optional convertToBucket(final FluidResource fluidResource) { + public Optional fillContainer(final ItemStack container, + final ResourceAmount resourceAmount) { + throw new UnsupportedOperationException(); + } + + @Override + public Optional getFilledBucket(final FluidResource fluidResource) { throw new UnsupportedOperationException(); } diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/PlatformImpl.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/PlatformImpl.java index a867c2e0a..afa8b3e6c 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/PlatformImpl.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/PlatformImpl.java @@ -3,6 +3,8 @@ import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.platform.api.support.resource.FluidOperationResult; import com.refinedmods.refinedstorage.platform.common.AbstractPlatform; import com.refinedmods.refinedstorage.platform.common.Config; import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferManager; @@ -126,12 +128,12 @@ public GridResourceFactory getFluidGridResourceFactory() { } @Override - public Optional getContainedFluid(final ItemStack stack) { - if (stack.isEmpty()) { + public Optional drainContainer(final ItemStack container) { + if (container.isEmpty()) { return Optional.empty(); } - final SimpleSingleStackStorage interceptingStorage = new SimpleSingleStackStorage(stack); - final Storage storage = FluidStorage.ITEM.find(stack, ContainerItemContext.ofSingleSlot( + final SimpleSingleStackStorage interceptingStorage = new SimpleSingleStackStorage(container); + final Storage storage = FluidStorage.ITEM.find(container, ContainerItemContext.ofSingleSlot( interceptingStorage )); try (Transaction tx = Transaction.openOuter()) { @@ -139,7 +141,7 @@ public Optional getContainedFluid(final ItemStack stack) { if (extracted == null) { return Optional.empty(); } - return Optional.of(new ContainedFluid( + return Optional.of(new FluidOperationResult( interceptingStorage.getStack(), ofFluidVariant(extracted.resource()), extracted.amount() @@ -148,7 +150,30 @@ public Optional getContainedFluid(final ItemStack stack) { } @Override - public Optional convertToBucket(final FluidResource fluidResource) { + public Optional fillContainer(final ItemStack container, + final ResourceAmount resourceAmount) { + if (!(resourceAmount.getResource() instanceof FluidResource fluidResource)) { + return Optional.empty(); + } + final SimpleSingleStackStorage interceptingStorage = new SimpleSingleStackStorage(container); + final Storage storage = FluidStorage.ITEM.find(container, ContainerItemContext.ofSingleSlot( + interceptingStorage + )); + if (storage == null) { + return Optional.empty(); + } + try (Transaction tx = Transaction.openOuter()) { + final long inserted = storage.insert(toFluidVariant(fluidResource), resourceAmount.getAmount(), tx); + return Optional.of(new FluidOperationResult( + interceptingStorage.getStack(), + fluidResource, + inserted + )); + } + } + + @Override + public Optional getFilledBucket(final FluidResource fluidResource) { final SimpleSingleStackStorage interceptingStorage = SimpleSingleStackStorage.forEmptyBucket(); final Storage destination = FluidStorage.ITEM.find( interceptingStorage.getStack(), diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/PlatformImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/PlatformImpl.java index 9fe267ffb..898babd8c 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/PlatformImpl.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/PlatformImpl.java @@ -3,6 +3,8 @@ import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.platform.api.support.resource.FluidOperationResult; import com.refinedmods.refinedstorage.platform.common.AbstractPlatform; import com.refinedmods.refinedstorage.platform.common.Config; import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferManager; @@ -121,10 +123,10 @@ public GridResourceFactory getFluidGridResourceFactory() { } @Override - public Optional getContainedFluid(final ItemStack stack) { + public Optional drainContainer(final ItemStack container) { final FluidTank tank = new FluidTank(Integer.MAX_VALUE); final FluidActionResult result = FluidUtil.tryEmptyContainer( - stack, + container, tank, Integer.MAX_VALUE, null, @@ -134,7 +136,7 @@ public Optional getContainedFluid(final ItemStack stack) { return Optional.empty(); } final FluidResource fluidResource = ofFluidStack(tank.getFluid()); - return Optional.of(new ContainedFluid( + return Optional.of(new FluidOperationResult( result.getResult(), fluidResource, tank.getFluidAmount() @@ -142,7 +144,20 @@ public Optional getContainedFluid(final ItemStack stack) { } @Override - public Optional convertToBucket(final FluidResource fluidResource) { + public Optional fillContainer(final ItemStack container, + final ResourceAmount resourceAmount) { + if (!(resourceAmount.getResource() instanceof FluidResource fluidResource)) { + return Optional.empty(); + } + return FluidUtil.getFluidHandler(container).map(handler -> { + final FluidStack fluidStack = toFluidStack(fluidResource, resourceAmount.getAmount()); + final long filled = handler.fill(fluidStack, IFluidHandler.FluidAction.EXECUTE); + return new FluidOperationResult(handler.getContainer(), fluidResource, filled); + }); + } + + @Override + public Optional getFilledBucket(final FluidResource fluidResource) { return Optional.ofNullable( new ItemStack(Items.BUCKET).getCapability(Capabilities.FluidHandler.ITEM) ).map(dest -> { From 16bf161947705a6e62d932f633231776547ad4ac Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 13 Jul 2024 12:38:04 +0200 Subject: [PATCH 02/36] ci: re-add sonar exclusions --- build.gradle.kts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index cf817e367..15067a4da 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,5 @@ +import org.sonarqube.gradle.SonarExtension + plugins { id("refinedarchitect.root") id("refinedarchitect.base") @@ -10,3 +12,9 @@ refinedarchitect { subprojects { group = "com.refinedmods.refinedstorage" } + +project.extensions.getByType().apply { + properties { + property("sonar.coverage.exclusions", "refinedstorage-platform-neoforge/**/*,refinedstorage-platform-fabric/**/*,refinedstorage-platform-common/**/*,refinedstorage-platform-api/**/*") + } +} From 22e08a9e6e4ae712dc50f0a2eb4a33161ca22e75 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 13 Jul 2024 22:31:04 +0200 Subject: [PATCH 03/36] fix: crash when trying to export fluids on Fabric If the destination supports items and fluids, and we try to export fluids, it would also try the item strategy, and try to convert fluid into an item, which doesn't work, and throws an NPE. --- CHANGELOG.md | 4 ++++ .../fabric/storage/FabricStorageInsertableStorage.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9e94576c..f6048e022 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - Ability to extract fluids from the Interface using an empty bucket or other empty fluid container. +### Fixed + +- Fixed crash when trying to export fluids into an Interface on Fabric. + ## [2.0.0-milestone.4.4] - 2024-07-10 ## [2.0.0-milestone.4.3] - 2024-07-06 diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageInsertableStorage.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageInsertableStorage.java index 4285c2d17..f5c3cb9ee 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageInsertableStorage.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageInsertableStorage.java @@ -41,6 +41,9 @@ public long insert(final ResourceKey resource, final long amount, final Action a return 0; } final T platformResource = toPlatformMapper.apply(resource); + if (platformResource == null) { + return 0; + } final long correctedAmount = amountOverride.overrideAmount( resource, amount, From 3e02db08e438b4bd34bb30be2216f8583e7291e5 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 14 Jul 2024 01:46:26 +0200 Subject: [PATCH 04/36] style: cleanup --- .github/CONTRIBUTING.md | 3 +- .github/ISSUE_TEMPLATE/config.yml | 1 + .github/workflows/build.yml | 2 +- .github/workflows/draft-release.yml | 2 +- .../issue-for-unsupported-version.yml | 2 +- .github/workflows/publish-release.yml | 2 +- .github/workflows/resolved-issue-locking.yml | 4 +- .github/workflows/validate-branch-name.yml | 2 +- .github/workflows/validate-changelog.yml | 2 +- .../workflows/validate-commit-messages.yml | 2 +- .gitignore | 1 + .idea/dictionaries/refinedstorage.xml | 31 ++ .idea/inspectionProfiles/refinedstorage.xml | 10 + README.md | 3 +- config/checkstyle/checkstyle.xml | 1 + .../core/component/ComponentMapFactory.java | 1 - .../api/core/CoreValidationsTest.java | 2 + .../api/grid/query/GridQueryParserImpl.java | 19 +- .../api/grid/view/GridView.java | 2 +- .../api/grid/view/GridViewImpl.java | 2 +- .../grid/service/GridOperationsImplTest.java | 6 + .../api/grid/service/package-info.java | 7 + .../api/grid/view/GridViewImplTest.java | 16 +- .../api/network/security/SecurityPolicy.java | 3 - .../network/test/NetworkTestExtension.java | 1 - .../AbstractNetworkNodeFactory.java | 7 +- .../ControllerNetworkNodeFactory.java | 3 +- .../DetectorNetworkNodeFactory.java | 3 +- .../ExporterNetworkNodeFactory.java | 3 +- .../ExternalStorageNetworkNodeFactory.java | 3 +- .../nodefactory/GridNetworkNodeFactory.java | 3 +- .../ImporterNetworkNodeFactory.java | 3 +- .../InterfaceNetworkNodeFactory.java | 3 +- .../test/nodefactory/NetworkNodeFactory.java | 3 +- .../RelayInputNetworkNodeFactory.java | 3 +- .../RelayOutputNetworkNodeFactory.java | 3 +- .../nodefactory/SimpleNetworkNodeFactory.java | 3 +- .../StorageNetworkNodeFactory.java | 3 +- .../StorageTransferNetworkNodeFactory.java | 3 +- .../test/NetworkTestExtensionTest.java | 1 + .../NetworkNodeContainerPriorities.java | 4 +- .../impl/AbstractNetworkBuilderImplTest.java | 3 +- .../impl/RemoveNetworkBuilderImplTest.java | 4 +- .../api/network/impl/SpyingNetworkNode.java | 27 -- .../impl/node/SimpleNetworkNodeTest.java | 1 + ...FirstAvailableExporterNetworkNodeTest.java | 1 + .../ExternalStorageNetworkNodeTest.java | 2 + .../relay/RelayEnergyNetworkNodeTest.java | 1 + .../impl/node/relay/RelayNetworkNodeTest.java | 1 + .../relay/RelaySecurityNetworkNodeTest.java | 1 + .../relay/RelayStorageNetworkNodeTest.java | 1 + .../node/storage/StorageNetworkNodeTest.java | 8 +- .../platform/api/PlatformApi.java | 3 - .../platform/api/PlatformApiProxy.java | 6 - .../platform/api/grid/GridSynchronizer.java | 1 + .../view/AbstractPlatformGridResource.java | 7 +- .../api/grid/view/PlatformGridResource.java | 1 + .../api/support/resource/ResourceType.java | 3 - .../upgrade/BuiltinUpgradeDestinations.java | 16 - .../platform/common/Platform.java | 2 +- .../platform/common/PlatformApiImpl.java | 8 - .../ConfigurationCardItem.java | 1 + .../AbstractItemConstructorStrategy.java | 9 +- .../ItemDropConstructorStrategy.java | 8 +- .../PlaceBlockConstructorStrategy.java | 8 +- .../PlaceFireworksConstructorStrategy.java | 8 +- .../common/detector/DetectorBlock.java | 1 - .../common/detector/DetectorBlockEntity.java | 2 +- .../common/detector/DetectorModeSettings.java | 1 - .../grid/AbstractGridContainerMenu.java | 1 + .../grid/CraftingGridContainerMenu.java | 6 +- .../common/grid/CraftingGridResultSlot.java | 2 + .../grid/screen/AbstractGridScreen.java | 11 +- .../common/networking/CableBlock.java | 3 - .../common/storage/AccessModeSettings.java | 1 - .../diskinterface/TransferModeSettings.java | 9 +- .../externalstorage/ExternalStorageBlock.java | 1 - .../ExternalStorageBlockEntity.java | 1 - .../portablegrid/PortableGridBlock.java | 1 - .../ItemStorageMonitorExtractionStrategy.java | 1 - .../storagemonitor/StorageMonitorBlock.java | 1 - .../common/support/AbstractBaseBlock.java | 3 - .../common/support/AbstractBaseScreen.java | 5 + .../AbstractDirectionalCableBlock.java | 3 - .../support/ClientToServerCommunications.java | 45 --- .../common/support/FilterModeSettings.java | 9 +- .../common/support/RedstoneModeSettings.java | 1 - ...actingNetworkNodeContainerBlockEntity.java | 1 - .../NetworkBoundItemSessionImpl.java | 1 + .../common/support/packet/c2s/C2SPackets.java | 3 + .../support/resource/FluidResource.java | 2 +- .../support/resource/FluidResourceType.java | 7 - .../common/support/resource/ItemResource.java | 2 +- .../support/resource/ItemResourceType.java | 7 - .../resource/ResourceContainerSlot.java | 9 - .../resource/list/FuzzyResourceListImpl.java | 3 - .../common/support/widget/History.java | 3 +- .../support/widget/SearchFieldWidget.java | 2 +- .../BuiltinUpgradeDestinationsImpl.java | 31 -- .../common/upgrade/RegulatorUpgradeItem.java | 21 +- .../common/upgrade/UpgradeDestinations.java | 17 +- .../WirelessTransmitterBlock.java | 1 - .../assets/refinedstorage/lang/nl_nl.json | 365 ------------------ .../models/block/disk/led_full.json | 1 - .../models/block/disk/led_near_capacity.json | 1 - .../registry/PlatformRegistryImplTest.java | 1 + .../list/FuzzyResourceListImplTest.java | 3 + .../platform/fabric/ConfigImpl.java | 5 +- .../platform/fabric/ModInitializerImpl.java | 1 + .../support/render/EmissiveTransform.java | 1 + .../fabric/support/render/QuadRotator.java | 6 +- .../platform/neoforge/ConfigImpl.java | 4 +- .../platform/neoforge/ModInitializer.java | 1 + .../platform/neoforge/PlatformImpl.java | 2 +- .../support/energy/EnergyStorageAdapter.java | 12 +- .../render/RotationTranslationModelBaker.java | 8 +- .../platform/common/GameTestUtil.java | 3 - .../refinedstorage/query/parser/Parser.java | 2 +- .../refinedstorage/query/lexer/LexerTest.java | 22 +- .../query/parser/ParserTest.java | 24 +- .../api/storage/TransferHelperTest.java | 12 +- .../channel/StorageChannelImplTest.java | 1 + .../composite/CompositeStorageImplTest.java | 1 + .../tracked/TrackedStorageImplTest.java | 7 + settings.gradle.kts | 12 +- 125 files changed, 251 insertions(+), 771 deletions(-) create mode 100644 .idea/dictionaries/refinedstorage.xml create mode 100644 .idea/inspectionProfiles/refinedstorage.xml create mode 100644 refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/package-info.java delete mode 100644 refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/SpyingNetworkNode.java delete mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/BuiltinUpgradeDestinations.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/ClientToServerCommunications.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/BuiltinUpgradeDestinationsImpl.java delete mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/nl_nl.json diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index d929057b3..e8fb13b30 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -12,6 +12,7 @@ These are the most important things to know before contributing (also explained - Branch names must be formatted correctly. The format is `{category}/GH-{issue number}/{lowercase-description}`. Category must match a category [used in our Commitlint config](https://github.com/conventional-changelog/commitlint/tree/master/%40commitlint/config-conventional#type-enum). + You can also use `NO-ISSUE` instead of a GitHub issue number. - We use [Checkstyle](https://checkstyle.sourceforge.io/) in our build workflow to validate coding style. It is recommended to import the [config/checkstyle/checkstyle.xml](../config/checkstyle/checkstyle.xml) or [config/intellij-code-style.xml](../config/intellij-code-style.xml) file into your @@ -47,7 +48,7 @@ Because we use merge commits when merging a PR, branch names will be part of the branch names must follow a certain standard. The format is `{category}/GH-{issue number}/{lowercase-description}` and a branch name can be maximum 50 characters of -length. +length. You can also use `NO-ISSUE` instead of a GitHub issue number. Category must match a category [used in our Commitlint config](https://github.com/conventional-changelog/commitlint/tree/master/%40commitlint/config-conventional#type-enum). diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 9e5add64b..427564528 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,3 +1,4 @@ +#file: noinspection YAMLSchemaValidation,YAMLSchemaValidation blank_issues_enabled: true contact_links: - name: Discord Community Support diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dcdc4de5b..8754bf00d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: types: [ opened, synchronize, reopened ] jobs: build: - uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.16.4 + uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.16.6 with: gametests: true secrets: inherit diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 2300f88fd..e835fe3d6 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -17,7 +17,7 @@ on: type: string jobs: draft: - uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.16.4 + uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.16.6 with: release-type: ${{ inputs.release-type }} version-number-override: ${{ inputs.version-number-override }} diff --git a/.github/workflows/issue-for-unsupported-version.yml b/.github/workflows/issue-for-unsupported-version.yml index 7444dec88..f93f0ac62 100644 --- a/.github/workflows/issue-for-unsupported-version.yml +++ b/.github/workflows/issue-for-unsupported-version.yml @@ -4,4 +4,4 @@ on: types: [ labeled, unlabeled, reopened ] jobs: unsupported-labeler: - uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.16.4 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.16.6 \ No newline at end of file diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 5cfaf1f6c..cd00e761b 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -7,7 +7,7 @@ on: - closed jobs: publish-release: - uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.16.4 + uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.16.6 secrets: inherit with: project-name: 'Refined Storage' diff --git a/.github/workflows/resolved-issue-locking.yml b/.github/workflows/resolved-issue-locking.yml index ee10c5cfc..25495168a 100644 --- a/.github/workflows/resolved-issue-locking.yml +++ b/.github/workflows/resolved-issue-locking.yml @@ -1,7 +1,7 @@ name: Lock resolved issues and PRs on: schedule: - - cron: '0 0 * * *' + - cron: '0 0 * * 1' jobs: lock: - uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.16.4 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.16.6 \ No newline at end of file diff --git a/.github/workflows/validate-branch-name.yml b/.github/workflows/validate-branch-name.yml index 161415298..8d8cb7693 100644 --- a/.github/workflows/validate-branch-name.yml +++ b/.github/workflows/validate-branch-name.yml @@ -2,4 +2,4 @@ name: Validate branch name on: [ pull_request ] jobs: validate-branch-name: - uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.16.4 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.16.6 \ No newline at end of file diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml index d2a2d80d7..d96832f2c 100644 --- a/.github/workflows/validate-changelog.yml +++ b/.github/workflows/validate-changelog.yml @@ -4,4 +4,4 @@ on: types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ] jobs: validate-changelog: - uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.16.4 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.16.6 \ No newline at end of file diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml index 449efa5d2..f1db39522 100644 --- a/.github/workflows/validate-commit-messages.yml +++ b/.github/workflows/validate-commit-messages.yml @@ -2,4 +2,4 @@ name: Validate commit messages on: [ pull_request ] jobs: validate-commit-messages: - uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.16.4 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.16.6 \ No newline at end of file diff --git a/.gitignore b/.gitignore index 766ed11d8..2574d4f82 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ eclipse/ *.iws .idea/ !.idea/dictionaries/refinedstorage.xml +!.idea/inspectionProfiles/refinedstorage.xml !.idea/icon.png out/ /bin/ diff --git a/.idea/dictionaries/refinedstorage.xml b/.idea/dictionaries/refinedstorage.xml new file mode 100644 index 000000000..5932a79c6 --- /dev/null +++ b/.idea/dictionaries/refinedstorage.xml @@ -0,0 +1,31 @@ + + + + allowlist + autocrafting + autoselected + blocklist + cullface + emissive + firstperson + frametime + gametests + glowstone + iface + leds + lefthand + modloader + modrinth + netherite + overworld + patreon + raoulvdberge + redstone + refinedarchitect + refinedmods + refinedstorage + righthand + thirdperson + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/refinedstorage.xml b/.idea/inspectionProfiles/refinedstorage.xml new file mode 100644 index 000000000..c518fa1db --- /dev/null +++ b/.idea/inspectionProfiles/refinedstorage.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/README.md b/README.md index c7f8db9c9..9be5e62d7 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +

Refined Storage logo

Refined Storage 2

@@ -15,7 +16,7 @@ access the inventories of many devices through a single unified GUI. This mod not only adds storage solutions, but also devices that can be used to manipulate items and blocks in the world and from within the system, such as importers, exporters, constructors, destructors, and more! There are also devices in -this mod that allow the player to setup auto-crafting, allowing the crafting of complex recipes in a few simple clicks. +this mod that allow the player to set up auto-crafting, allowing the crafting of complex recipes in a few simple clicks. ## Links diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index 0f886cd2a..49d68cdb1 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -2,6 +2,7 @@ + diff --git a/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/component/ComponentMapFactory.java b/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/component/ComponentMapFactory.java index 8f1579162..770a781d3 100644 --- a/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/component/ComponentMapFactory.java +++ b/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/component/ComponentMapFactory.java @@ -26,7 +26,6 @@ public ComponentMapFactory copy() { return new ComponentMapFactory<>(new LinkedHashMap<>(factories)); } - @SuppressWarnings("unchecked") public ComponentMap buildComponentMap(final X context) { final Map, C> components = new LinkedHashMap<>(); factories.forEach((componentType, factory) -> { diff --git a/refinedstorage-core-api/src/test/java/com/refinedmods/refinedstorage/api/core/CoreValidationsTest.java b/refinedstorage-core-api/src/test/java/com/refinedmods/refinedstorage/api/core/CoreValidationsTest.java index 3bcb34c4a..a1c3c3e94 100644 --- a/refinedstorage-core-api/src/test/java/com/refinedmods/refinedstorage/api/core/CoreValidationsTest.java +++ b/refinedstorage-core-api/src/test/java/com/refinedmods/refinedstorage/api/core/CoreValidationsTest.java @@ -35,6 +35,7 @@ void shouldValidateEquals() { } @Test + @SuppressWarnings("ObviousNullCheck") void shouldValidateNull() { // Act & assert final Exception e = assertThrows( @@ -47,6 +48,7 @@ void shouldValidateNull() { } @Test + @SuppressWarnings("ObviousNullCheck") void shouldValidateNotNull() { // Act & assert final Exception e = assertThrows( diff --git a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParserImpl.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParserImpl.java index 6a86c42ae..a7a3e6ea0 100644 --- a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParserImpl.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParserImpl.java @@ -45,7 +45,7 @@ public GridQueryParserImpl(final LexerTokenMappings tokenMappings, @Override public Predicate parse(final String query) throws GridQueryParserException { - if ("".equals(query.trim())) { + if (query.trim().isEmpty()) { return resource -> true; } final List tokens = getTokens(query); @@ -82,16 +82,13 @@ private Predicate implicitAnd(final List nodes) throws GridQ } private Predicate parseNode(final Node node) throws GridQueryParserException { - if (node instanceof LiteralNode literalNode) { - return parseLiteral(literalNode); - } else if (node instanceof UnaryOpNode unaryOpNode) { - return parseUnaryOp(unaryOpNode); - } else if (node instanceof BinOpNode binOpNode) { - return parseBinOp(binOpNode); - } else if (node instanceof ParenNode parenNode) { - return implicitAnd(parenNode.nodes()); - } - throw new GridQueryParserException("Unsupported node", null); + return switch (node) { + case LiteralNode literalNode -> parseLiteral(literalNode); + case UnaryOpNode unaryOpNode -> parseUnaryOp(unaryOpNode); + case BinOpNode binOpNode -> parseBinOp(binOpNode); + case ParenNode parenNode -> implicitAnd(parenNode.nodes()); + default -> throw new GridQueryParserException("Unsupported node", null); + }; } private Predicate parseBinOp(final BinOpNode node) throws GridQueryParserException { diff --git a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridView.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridView.java index d995757e9..9f25238cc 100644 --- a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridView.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridView.java @@ -72,7 +72,7 @@ public interface GridView { /** * Applies a change to a resource. Will update the backing list, and will also update the view list (depending - * if the view is preventing sorting). + * on if the view is preventing sorting). * * @param resource the resource * @param amount the amount, can be negative or positive diff --git a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImpl.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImpl.java index abdf96a5c..49394645e 100644 --- a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImpl.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImpl.java @@ -215,7 +215,7 @@ private void addIntoView(final GridResource resource) { if (wouldBePosition < 0) { viewList.add(-wouldBePosition - 1, resource); } else { - // If the "would be" position is positive, this means that the resource is already contained in the list, + // If the "would-be" position is positive, this means that the resource is already contained in the list, // comparing with sorting rules. // This doesn't mean that the *exact* resource is already in the list, but that is purely "contained" // in the list when comparing with sorting rules. diff --git a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/GridOperationsImplTest.java b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/GridOperationsImplTest.java index e6e5647d5..260bbc6da 100644 --- a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/GridOperationsImplTest.java +++ b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/GridOperationsImplTest.java @@ -41,6 +41,7 @@ void setUp() { class InsertTest { @ParameterizedTest @EnumSource(GridInsertMode.class) + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug void shouldInsertIntoDestination(final GridInsertMode insertMode) { // Arrange final Storage source = new LimitedStorageImpl(100); @@ -120,6 +121,7 @@ void shouldNotInsertIntoDestinationWhenNoSpaceIsPresentInDestination(final GridI @Nested class InsertEntireResourceTest { @Test + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug void shouldInsertIntoDestinationWithRemainder() { // Arrange final Storage source = new LimitedStorageImpl(100); @@ -192,6 +194,7 @@ public long extract(final ResourceKey resource, class ExtractTest { @ParameterizedTest @EnumSource(GridExtractMode.class) + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug void shouldExtractFromSourceToDestination(final GridExtractMode extractMode) { // Arrange final Storage destination = new LimitedStorageImpl(100); @@ -272,6 +275,7 @@ void shouldNotExtractFromSourceIfThereIsNoSpaceInDestination(final GridExtractMo @Nested class ExtractEntireResourceTest { @Test + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug void shouldExtractEntireResourceFromSourceToDestinationIfResourceIsLessThanMaxCount() { // Arrange final Storage destination = new LimitedStorageImpl(100); @@ -296,6 +300,7 @@ void shouldExtractEntireResourceFromSourceToDestinationIfResourceIsLessThanMaxCo } @Test + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug void shouldExtractEntireResourceWithRemainderFromSourceToDestinationIfThereIsNotEnoughSpaceInDestination() { // Arrange final Storage destination = new LimitedStorageImpl(MAX_COUNT - 1); @@ -325,6 +330,7 @@ void shouldExtractEntireResourceWithRemainderFromSourceToDestinationIfThereIsNot @Nested class ExtractHalfResourceTest { @Test + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug void shouldExtractSingleAmountIfResourceHasSingleAmountWhenExtractingHalfResourceFromSourceToDestination() { // Arrange final Storage destination = new LimitedStorageImpl(MAX_COUNT); diff --git a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/package-info.java b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/package-info.java new file mode 100644 index 000000000..7a3c634f8 --- /dev/null +++ b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.grid.service; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImplTest.java b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImplTest.java index 32679b515..3c3c52029 100644 --- a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImplTest.java +++ b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImplTest.java @@ -28,8 +28,12 @@ class GridViewImplTest { @BeforeEach void setUp() { - viewBuilder = new GridViewBuilderImpl( - resourceAmount -> Optional.of(new GridResourceImpl(resourceAmount)), + viewBuilder = getViewBuilder(resourceAmount -> Optional.of(new GridResourceImpl(resourceAmount))); + } + + private static GridViewBuilderImpl getViewBuilder(final GridResourceFactory resourceFactory) { + return new GridViewBuilderImpl( + resourceFactory, view -> Comparator.comparing(GridResource::getName), view -> Comparator.comparing(GridResource::getAmount) ); @@ -42,10 +46,8 @@ void shouldAddResourcesWithSameNameButDifferentIdentity() { // in the view, but actually isn't because it has a different identity. // Arrange - final GridViewBuilder builder = new GridViewBuilderImpl( - resourceAmount -> Optional.of(new GridResourceWithMetadata(resourceAmount)), - view -> Comparator.comparing(GridResource::getName), - view -> Comparator.comparing(GridResource::getAmount) + final GridViewBuilder builder = getViewBuilder( + resourceAmount -> Optional.of(new GridResourceWithMetadata(resourceAmount)) ); final GridView view = builder.build(); @@ -92,6 +94,7 @@ void shouldPreserveOrderWhenSortingAndTwoResourcesHaveTheSameQuantity() { } @Test + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug void shouldLoadResourcesAndRetrieveTrackedResourcesProperly() { // Arrange final GridView view = viewBuilder @@ -344,6 +347,7 @@ void shouldNotReorderExistingResourceWhenPreventingSorting() { } @Test + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug void shouldUpdateTrackedResourceAfterReceivingChange() { // Act final GridView view = viewBuilder.build(); diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityPolicy.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityPolicy.java index 0f93e29c4..107dec96e 100644 --- a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityPolicy.java +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityPolicy.java @@ -1,14 +1,11 @@ package com.refinedmods.refinedstorage.api.network.security; -import java.util.Collections; import java.util.Set; import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.3.5") public record SecurityPolicy(Set allowedPermissions) { - public static final SecurityPolicy EMPTY = new SecurityPolicy(Collections.emptySet()); - public static SecurityPolicy of(final Permission... permissions) { return new SecurityPolicy(Set.of(permissions)); } diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/NetworkTestExtension.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/NetworkTestExtension.java index 3e9a33b7a..4821e31db 100644 --- a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/NetworkTestExtension.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/NetworkTestExtension.java @@ -150,7 +150,6 @@ private void addNetworkNode(final Object testInstance, final Field field) { final Class type = field.getType(); final Map properties = getProperties(annotation.properties()); final NetworkNode resolvedNode = networkNodeFactories.get(type).create( - annotation, properties ); final Network network = networkMap.get(annotation.networkId()); diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/AbstractNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/AbstractNetworkNodeFactory.java index 3f39a02c6..a044859b5 100644 --- a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/AbstractNetworkNodeFactory.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/AbstractNetworkNodeFactory.java @@ -2,7 +2,6 @@ import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; import com.refinedmods.refinedstorage.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage.network.test.AddNetworkNode; import java.util.Map; @@ -11,8 +10,8 @@ public abstract class AbstractNetworkNodeFactory implements NetworkNodeFactory { public static final String PROPERTY_ENERGY_USAGE = "energy_usage"; @Override - public final NetworkNode create(final AddNetworkNode ctx, final Map properties) { - final AbstractNetworkNode value = innerCreate(ctx, properties); + public final NetworkNode create(final Map properties) { + final AbstractNetworkNode value = innerCreate(properties); final boolean active = (boolean) properties.getOrDefault(PROPERTY_ACTIVE, true); value.setActive(active); return value; @@ -22,5 +21,5 @@ protected final long getEnergyUsage(final Map properties) { return (long) properties.getOrDefault(PROPERTY_ENERGY_USAGE, 0L); } - protected abstract AbstractNetworkNode innerCreate(AddNetworkNode ctx, Map properties); + protected abstract AbstractNetworkNode innerCreate(Map properties); } diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ControllerNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ControllerNetworkNodeFactory.java index cc1abcb17..ab829a9a3 100644 --- a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ControllerNetworkNodeFactory.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ControllerNetworkNodeFactory.java @@ -2,13 +2,12 @@ import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; import com.refinedmods.refinedstorage.api.network.impl.node.controller.ControllerNetworkNode; -import com.refinedmods.refinedstorage.network.test.AddNetworkNode; import java.util.Map; public class ControllerNetworkNodeFactory extends AbstractNetworkNodeFactory { @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + protected AbstractNetworkNode innerCreate(final Map properties) { return new ControllerNetworkNode(); } } diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/DetectorNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/DetectorNetworkNodeFactory.java index 3b6f64a86..088ef6d64 100644 --- a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/DetectorNetworkNodeFactory.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/DetectorNetworkNodeFactory.java @@ -2,13 +2,12 @@ import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorNetworkNode; -import com.refinedmods.refinedstorage.network.test.AddNetworkNode; import java.util.Map; public class DetectorNetworkNodeFactory extends AbstractNetworkNodeFactory { @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + protected AbstractNetworkNode innerCreate(final Map properties) { return new DetectorNetworkNode(getEnergyUsage(properties)); } } diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ExporterNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ExporterNetworkNodeFactory.java index b20ec5adb..2e3cfe784 100644 --- a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ExporterNetworkNodeFactory.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ExporterNetworkNodeFactory.java @@ -2,13 +2,12 @@ import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; import com.refinedmods.refinedstorage.api.network.impl.node.exporter.ExporterNetworkNode; -import com.refinedmods.refinedstorage.network.test.AddNetworkNode; import java.util.Map; public class ExporterNetworkNodeFactory extends AbstractNetworkNodeFactory { @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + protected AbstractNetworkNode innerCreate(final Map properties) { return new ExporterNetworkNode(getEnergyUsage(properties)); } } diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ExternalStorageNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ExternalStorageNetworkNodeFactory.java index 711c734c9..97837394a 100644 --- a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ExternalStorageNetworkNodeFactory.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ExternalStorageNetworkNodeFactory.java @@ -3,13 +3,12 @@ import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; import com.refinedmods.refinedstorage.api.network.impl.node.externalstorage.ExternalStorageNetworkNode; import com.refinedmods.refinedstorage.api.storage.tracked.InMemoryTrackedStorageRepository; -import com.refinedmods.refinedstorage.network.test.AddNetworkNode; import java.util.Map; public class ExternalStorageNetworkNodeFactory extends AbstractNetworkNodeFactory { @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + protected AbstractNetworkNode innerCreate(final Map properties) { final ExternalStorageNetworkNode externalStorage = new ExternalStorageNetworkNode( getEnergyUsage(properties), () -> 0L diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/GridNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/GridNetworkNodeFactory.java index d883b3dc9..218bb94e1 100644 --- a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/GridNetworkNodeFactory.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/GridNetworkNodeFactory.java @@ -2,13 +2,12 @@ import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; import com.refinedmods.refinedstorage.api.network.impl.node.grid.GridNetworkNode; -import com.refinedmods.refinedstorage.network.test.AddNetworkNode; import java.util.Map; public class GridNetworkNodeFactory extends AbstractNetworkNodeFactory { @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + protected AbstractNetworkNode innerCreate(final Map properties) { return new GridNetworkNode(getEnergyUsage(properties)); } } diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ImporterNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ImporterNetworkNodeFactory.java index 140166c81..2b2a3a056 100644 --- a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ImporterNetworkNodeFactory.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ImporterNetworkNodeFactory.java @@ -2,13 +2,12 @@ import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterNetworkNode; -import com.refinedmods.refinedstorage.network.test.AddNetworkNode; import java.util.Map; public class ImporterNetworkNodeFactory extends AbstractNetworkNodeFactory { @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + protected AbstractNetworkNode innerCreate(final Map properties) { return new ImporterNetworkNode(getEnergyUsage(properties)); } } diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/InterfaceNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/InterfaceNetworkNodeFactory.java index df491a059..6f9217a2c 100644 --- a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/InterfaceNetworkNodeFactory.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/InterfaceNetworkNodeFactory.java @@ -2,13 +2,12 @@ import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; import com.refinedmods.refinedstorage.api.network.impl.node.iface.InterfaceNetworkNode; -import com.refinedmods.refinedstorage.network.test.AddNetworkNode; import java.util.Map; public class InterfaceNetworkNodeFactory extends AbstractNetworkNodeFactory { @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + protected AbstractNetworkNode innerCreate(final Map properties) { return new InterfaceNetworkNode(getEnergyUsage(properties)); } } diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/NetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/NetworkNodeFactory.java index aac0d307e..5606df0ab 100644 --- a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/NetworkNodeFactory.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/NetworkNodeFactory.java @@ -1,11 +1,10 @@ package com.refinedmods.refinedstorage.network.test.nodefactory; import com.refinedmods.refinedstorage.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage.network.test.AddNetworkNode; import java.util.Map; @FunctionalInterface public interface NetworkNodeFactory { - NetworkNode create(AddNetworkNode ctx, Map properties); + NetworkNode create(Map properties); } diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/RelayInputNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/RelayInputNetworkNodeFactory.java index 704abcefa..f996b4f7b 100644 --- a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/RelayInputNetworkNodeFactory.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/RelayInputNetworkNodeFactory.java @@ -2,13 +2,12 @@ import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; import com.refinedmods.refinedstorage.api.network.impl.node.relay.RelayInputNetworkNode; -import com.refinedmods.refinedstorage.network.test.AddNetworkNode; import java.util.Map; public class RelayInputNetworkNodeFactory extends AbstractNetworkNodeFactory { @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + protected AbstractNetworkNode innerCreate(final Map properties) { return new RelayInputNetworkNode(getEnergyUsage(properties)); } } diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/RelayOutputNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/RelayOutputNetworkNodeFactory.java index 60305e8f2..faf146960 100644 --- a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/RelayOutputNetworkNodeFactory.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/RelayOutputNetworkNodeFactory.java @@ -2,13 +2,12 @@ import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; import com.refinedmods.refinedstorage.api.network.impl.node.relay.RelayOutputNetworkNode; -import com.refinedmods.refinedstorage.network.test.AddNetworkNode; import java.util.Map; public class RelayOutputNetworkNodeFactory extends AbstractNetworkNodeFactory { @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + protected AbstractNetworkNode innerCreate(final Map properties) { return new RelayOutputNetworkNode(getEnergyUsage(properties)); } } diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/SimpleNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/SimpleNetworkNodeFactory.java index cc59936b1..e8e6b5c3d 100644 --- a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/SimpleNetworkNodeFactory.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/SimpleNetworkNodeFactory.java @@ -2,13 +2,12 @@ import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; -import com.refinedmods.refinedstorage.network.test.AddNetworkNode; import java.util.Map; public class SimpleNetworkNodeFactory extends AbstractNetworkNodeFactory { @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + protected AbstractNetworkNode innerCreate(final Map properties) { return new SimpleNetworkNode(getEnergyUsage(properties)); } } diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/StorageNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/StorageNetworkNodeFactory.java index e36cc4722..d817112ad 100644 --- a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/StorageNetworkNodeFactory.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/StorageNetworkNodeFactory.java @@ -2,7 +2,6 @@ import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; import com.refinedmods.refinedstorage.api.network.impl.node.storage.StorageNetworkNode; -import com.refinedmods.refinedstorage.network.test.AddNetworkNode; import java.util.Map; @@ -11,7 +10,7 @@ public class StorageNetworkNodeFactory extends AbstractNetworkNodeFactory { public static final String PROPERTY_SIZE = "size"; @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + protected AbstractNetworkNode innerCreate(final Map properties) { final long energyUsagePerStorage = (long) properties.getOrDefault(PROPERTY_ENERGY_USAGE_PER_STORAGE, 0L); final int size = (int) properties.getOrDefault(PROPERTY_SIZE, 9); return new StorageNetworkNode( diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/StorageTransferNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/StorageTransferNetworkNodeFactory.java index 31405d6c0..6539531a3 100644 --- a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/StorageTransferNetworkNodeFactory.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/StorageTransferNetworkNodeFactory.java @@ -2,7 +2,6 @@ import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferNetworkNode; -import com.refinedmods.refinedstorage.network.test.AddNetworkNode; import java.util.Map; @@ -11,7 +10,7 @@ public class StorageTransferNetworkNodeFactory extends AbstractNetworkNodeFactor public static final String PROPERTY_SIZE = "size"; @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + protected AbstractNetworkNode innerCreate(final Map properties) { final long energyUsagePerStorage = (long) properties.getOrDefault(PROPERTY_ENERGY_USAGE_PER_STORAGE, 0L); final int size = (int) properties.getOrDefault(PROPERTY_SIZE, 6); return new StorageTransferNetworkNode( diff --git a/refinedstorage-network-test/src/test/java/com/refinedmods/refinedstorage/network/test/NetworkTestExtensionTest.java b/refinedstorage-network-test/src/test/java/com/refinedmods/refinedstorage/network/test/NetworkTestExtensionTest.java index 32a428b98..e28daaa0e 100644 --- a/refinedstorage-network-test/src/test/java/com/refinedmods/refinedstorage/network/test/NetworkTestExtensionTest.java +++ b/refinedstorage-network-test/src/test/java/com/refinedmods/refinedstorage/network/test/NetworkTestExtensionTest.java @@ -36,6 +36,7 @@ class NetworkTestExtensionTest { }) StorageNetworkNode storageInA; + @SuppressWarnings("DefaultAnnotationParam") @AddNetworkNode(networkId = "b", properties = { @AddNetworkNode.Property(key = AbstractNetworkNodeFactory.PROPERTY_ACTIVE, boolValue = false) }) diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/container/NetworkNodeContainerPriorities.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/container/NetworkNodeContainerPriorities.java index 987e4d235..e31c5234f 100644 --- a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/container/NetworkNodeContainerPriorities.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/container/NetworkNodeContainerPriorities.java @@ -3,8 +3,8 @@ public final class NetworkNodeContainerPriorities { /** * It is important that the grid has the highest priority when a network split or merge occurs. - * This priority will affect the grids that are part of the a) newly created network for a split and - * b) removed network in case of a merge. + * This priority will affect the grids that are part of the 1) newly created network for a split and + * 2) removed network in case of a merge. * For a network split, this will ensure that the grid will be able to invalidate all its watchers first and attach * to the newly created network. * After that, all the storages will be re-added into the newly created network. diff --git a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/AbstractNetworkBuilderImplTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/AbstractNetworkBuilderImplTest.java index 06c4656de..b1baf2c3f 100644 --- a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/AbstractNetworkBuilderImplTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/AbstractNetworkBuilderImplTest.java @@ -4,6 +4,7 @@ import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.network.NetworkBuilder; import com.refinedmods.refinedstorage.api.network.NetworkComponent; +import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; import com.refinedmods.refinedstorage.api.network.node.NetworkNode; import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; import com.refinedmods.refinedstorage.network.test.NetworkTestFixtures; @@ -74,7 +75,7 @@ protected static NetworkNodeContainer createContainer() { } private static NetworkNode createNode() { - return new SpyingNetworkNode(0); + return new SimpleNetworkNode(0); } protected static List getAddedContainers(final Network network) { diff --git a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/RemoveNetworkBuilderImplTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/RemoveNetworkBuilderImplTest.java index 0906e28a3..de75b6b9b 100644 --- a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/RemoveNetworkBuilderImplTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/RemoveNetworkBuilderImplTest.java @@ -122,7 +122,7 @@ void shouldSplitNetworkInTwo() { final List> splits = getNetworkSplits(container4.getNode().getNetwork()); assertThat(splits).hasSize(1); - assertThat(splits.get(0)).containsExactlyInAnyOrder(container1.getNode().getNetwork()); + assertThat(splits.getFirst()).containsExactlyInAnyOrder(container1.getNode().getNetwork()); assertThat(getAddedContainers(container4.getNode().getNetwork())) .containsExactlyInAnyOrder(container1, container2, container3, container4, container5); @@ -197,7 +197,7 @@ void shouldSplitNetworkInThree() { final List> splits = getNetworkSplits(container4.getNode().getNetwork()); assertThat(splits).hasSize(1); - assertThat(splits.get(0)) + assertThat(splits.getFirst()) .containsExactlyInAnyOrder(container2.getNode().getNetwork(), container3.getNode().getNetwork()); assertThat(getAddedContainers(container4.getNode().getNetwork())) diff --git a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/SpyingNetworkNode.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/SpyingNetworkNode.java deleted file mode 100644 index 2293aebdc..000000000 --- a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/SpyingNetworkNode.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.refinedmods.refinedstorage.api.network.impl; - -import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; - -public final class SpyingNetworkNode extends AbstractNetworkNode { - private final long energyUsage; - private int activenessChanges; - - public SpyingNetworkNode(final long energyUsage) { - this.energyUsage = energyUsage; - } - - @Override - protected void onActiveChanged(final boolean newActive) { - super.onActiveChanged(newActive); - activenessChanges++; - } - - public int getActivenessChanges() { - return activenessChanges; - } - - @Override - public long getEnergyUsage() { - return energyUsage; - } -} diff --git a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/SimpleNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/SimpleNetworkNodeTest.java index cdb7cd507..fa636efdf 100644 --- a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/SimpleNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/SimpleNetworkNodeTest.java @@ -16,6 +16,7 @@ @NetworkTest @SetupNetwork(energyStored = 10, energyCapacity = 100) class SimpleNetworkNodeTest { + @SuppressWarnings("DefaultAnnotationParam") @AddNetworkNode(properties = { @AddNetworkNode.Property(key = PROPERTY_ENERGY_USAGE, longValue = 10), @AddNetworkNode.Property(key = PROPERTY_ACTIVE, boolValue = false) diff --git a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/FirstAvailableExporterNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/FirstAvailableExporterNetworkNodeTest.java index 0c249d982..ea89e9214 100644 --- a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/FirstAvailableExporterNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/FirstAvailableExporterNetworkNodeTest.java @@ -31,6 +31,7 @@ protected TaskExecutor createTaskExecutor() { return new DefaultTaskExecutor<>(); } + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug @Test void shouldTransfer(@InjectNetworkStorageComponent final StorageNetworkComponent storage) { // Arrange diff --git a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/ExternalStorageNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/ExternalStorageNetworkNodeTest.java index 0abc32032..a04702497 100644 --- a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/ExternalStorageNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/ExternalStorageNetworkNodeTest.java @@ -466,6 +466,7 @@ void shouldNoLongerShowOnNetworkWhenRemovedWithoutInitializedStorage( assertThat(networkStorage.getAll()).isEmpty(); } + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug @ParameterizedTest @EnumSource(Action.class) void shouldTrackChangesWhenExtracting( @@ -526,6 +527,7 @@ void shouldNotTrackChangesWhenExtractionFailed( assertThat(trackedResource).isEmpty(); } + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug @ParameterizedTest @EnumSource(Action.class) void shouldTrackChangesWhenInserting( diff --git a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayEnergyNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayEnergyNetworkNodeTest.java index 9ac83d57d..99c619d3e 100644 --- a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayEnergyNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayEnergyNetworkNodeTest.java @@ -30,6 +30,7 @@ @SetupNetwork(id = "input") @SetupNetwork(id = "output", setupEnergy = false) class RelayEnergyNetworkNodeTest { + @SuppressWarnings("DefaultAnnotationParam") @AddNetworkNode(properties = { @AddNetworkNode.Property(key = PROPERTY_ACTIVE, boolValue = false) }, networkId = "input") diff --git a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayNetworkNodeTest.java index 0655d2a1a..3c766ecf3 100644 --- a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayNetworkNodeTest.java @@ -42,6 +42,7 @@ class RelayNetworkNodeTest { private static final long INPUT_ENERGY_USAGE = 5; private static final long OUTPUT_ENERGY_USAGE = 5; + @SuppressWarnings("DefaultAnnotationParam") @AddNetworkNode(properties = { @AddNetworkNode.Property(key = PROPERTY_ENERGY_USAGE, longValue = INPUT_ENERGY_USAGE), @AddNetworkNode.Property(key = PROPERTY_ACTIVE, boolValue = false) diff --git a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelaySecurityNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelaySecurityNetworkNodeTest.java index 739b24d01..c07572fb3 100644 --- a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelaySecurityNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelaySecurityNetworkNodeTest.java @@ -32,6 +32,7 @@ @SetupNetwork(id = "input") @SetupNetwork(id = "output", setupEnergy = false) class RelaySecurityNetworkNodeTest { + @SuppressWarnings("DefaultAnnotationParam") @AddNetworkNode(properties = { @AddNetworkNode.Property(key = PROPERTY_ACTIVE, boolValue = false) }, networkId = "input") diff --git a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayStorageNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayStorageNetworkNodeTest.java index c1aaf57ec..12464d396 100644 --- a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayStorageNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayStorageNetworkNodeTest.java @@ -39,6 +39,7 @@ @SetupNetwork(id = "input") @SetupNetwork(id = "output", setupEnergy = false) class RelayStorageNetworkNodeTest { + @SuppressWarnings("DefaultAnnotationParam") @AddNetworkNode(properties = { @AddNetworkNode.Property(key = PROPERTY_ACTIVE, boolValue = false) }, networkId = "input") diff --git a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/StorageNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/StorageNetworkNodeTest.java index c27a7eac1..b7045a0e6 100644 --- a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/StorageNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/StorageNetworkNodeTest.java @@ -270,14 +270,14 @@ void shouldNotUpdateNetworkStorageWhenChangingStorageWhenInactive( initializeAndActivate(); // Act - final Collection preInactiveness = new HashSet<>(networkStorage.getAll()); + final Collection preInactive = new HashSet<>(networkStorage.getAll()); sut.setActive(false); sut.onStorageChanged(1); - final Collection postInactiveness = networkStorage.getAll(); + final Collection postInactive = networkStorage.getAll(); // Assert - assertThat(preInactiveness).isNotEmpty(); - assertThat(postInactiveness).isEmpty(); + assertThat(preInactive).isNotEmpty(); + assertThat(postInactive).isEmpty(); assertThat(networkStorage.getStored()).isZero(); } diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApi.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApi.java index e7a00ae74..a95741c8b 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApi.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApi.java @@ -42,7 +42,6 @@ import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceFactory; import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceProvider; -import com.refinedmods.refinedstorage.platform.api.upgrade.BuiltinUpgradeDestinations; import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; @@ -110,8 +109,6 @@ public interface PlatformApi { UpgradeRegistry getUpgradeRegistry(); - BuiltinUpgradeDestinations getBuiltinUpgradeDestinations(); - InWorldNetworkNodeContainer createInWorldNetworkNodeContainer(BlockEntity blockEntity, NetworkNode node, String name, diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApiProxy.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApiProxy.java index 76687e2f7..2b2116e60 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApiProxy.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApiProxy.java @@ -42,7 +42,6 @@ import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceFactory; import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceProvider; -import com.refinedmods.refinedstorage.platform.api.upgrade.BuiltinUpgradeDestinations; import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; @@ -176,11 +175,6 @@ public UpgradeRegistry getUpgradeRegistry() { return ensureLoaded().getUpgradeRegistry(); } - @Override - public BuiltinUpgradeDestinations getBuiltinUpgradeDestinations() { - return ensureLoaded().getBuiltinUpgradeDestinations(); - } - @Override public InWorldNetworkNodeContainer createInWorldNetworkNodeContainer( final BlockEntity blockEntity, diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridSynchronizer.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridSynchronizer.java index 6640be2b1..7ecbe81eb 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridSynchronizer.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridSynchronizer.java @@ -13,6 +13,7 @@ public interface GridSynchronizer { Component getHelpText(); + @SuppressWarnings("EmptyMethod") void synchronizeFromGrid(String text); @Nullable diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/AbstractPlatformGridResource.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/AbstractPlatformGridResource.java index 348934ca5..b2e0011f7 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/AbstractPlatformGridResource.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/AbstractPlatformGridResource.java @@ -3,7 +3,6 @@ import com.refinedmods.refinedstorage.api.grid.view.GridResourceAttributeKey; import com.refinedmods.refinedstorage.api.grid.view.GridView; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; import java.util.Collections; @@ -28,13 +27,9 @@ protected AbstractPlatformGridResource(final ResourceAmount resourceAmount, this.attributes = attributes; } - public ResourceKey getResource() { - return resourceAmount.getResource(); - } - @Override public Optional getTrackedResource(final GridView view) { - return view.getTrackedResource(getResource()); + return view.getTrackedResource(resourceAmount.getResource()); } @Override diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/PlatformGridResource.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/PlatformGridResource.java index 5b61c320a..5bbdf86b3 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/PlatformGridResource.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/PlatformGridResource.java @@ -41,5 +41,6 @@ void onScroll(GridScrollMode scrollMode, List getExtractionHints(); @Nullable + @API(status = API.Status.INTERNAL) PlatformResourceKey getUnderlyingResource(); } diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceType.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceType.java index 7ed1658f3..ca9780374 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceType.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceType.java @@ -8,7 +8,6 @@ import java.util.Optional; -import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.MutableComponent; @@ -20,8 +19,6 @@ public interface ResourceType { MapCodec getMapCodec(); - Codec getCodec(); - StreamCodec getStreamCodec(); MutableComponent getTitle(); diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/BuiltinUpgradeDestinations.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/BuiltinUpgradeDestinations.java deleted file mode 100644 index 0f824e073..000000000 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/BuiltinUpgradeDestinations.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.refinedmods.refinedstorage.platform.api.upgrade; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.0") -public interface BuiltinUpgradeDestinations { - UpgradeDestination getImporter(); - - UpgradeDestination getExporter(); - - UpgradeDestination getDestructor(); - - UpgradeDestination getConstructor(); - - UpgradeDestination getWirelessTransmitter(); -} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Platform.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Platform.java index 7262179d5..43969db56 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Platform.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Platform.java @@ -104,7 +104,7 @@ List processTooltipComponents( ItemStack stack, GuiGraphics graphics, int mouseX, - Optional imageComponent, + @SuppressWarnings("OptionalUsedAsFieldOrParameterType") Optional imageComponent, List components ); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformApiImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformApiImpl.java index b5115a5d1..4230c39e5 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformApiImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformApiImpl.java @@ -47,7 +47,6 @@ import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceFactory; import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceProvider; -import com.refinedmods.refinedstorage.platform.api.upgrade.BuiltinUpgradeDestinations; import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; import com.refinedmods.refinedstorage.platform.common.grid.NoopGridSynchronizer; @@ -78,7 +77,6 @@ import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResourceFactory; import com.refinedmods.refinedstorage.platform.common.support.slotreference.CompositeSlotReferenceProvider; import com.refinedmods.refinedstorage.platform.common.support.slotreference.InventorySlotReference; -import com.refinedmods.refinedstorage.platform.common.upgrade.BuiltinUpgradeDestinationsImpl; import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeRegistryImpl; import com.refinedmods.refinedstorage.platform.common.util.ServerEventQueue; import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.CompositeWirelessTransmitterRangeModifier; @@ -136,7 +134,6 @@ public class PlatformApiImpl implements PlatformApi { private final PlatformRegistry exporterTransferStrategyRegistry = new PlatformRegistryImpl<>(); private final UpgradeRegistry upgradeRegistry = new UpgradeRegistryImpl(); - private final BuiltinUpgradeDestinations builtinUpgradeDestinations = new BuiltinUpgradeDestinationsImpl(); private final Queue externalStorageProviderFactories = new PriorityQueue<>( Comparator.comparingInt(PlatformExternalStorageProviderFactory::getPriority) ); @@ -283,11 +280,6 @@ public UpgradeRegistry getUpgradeRegistry() { return upgradeRegistry; } - @Override - public BuiltinUpgradeDestinations getBuiltinUpgradeDestinations() { - return builtinUpgradeDestinations; - } - @Override public InWorldNetworkNodeContainer createInWorldNetworkNodeContainer( final BlockEntity blockEntity, diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardItem.java index 4cf94ebaa..9ee6ccfd9 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardItem.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardItem.java @@ -113,6 +113,7 @@ private CompoundTag createConfigTag(final ConfigurationCardTarget target, final return tag; } + @SuppressWarnings("resource") private void sendCopiedConfigurationMessage(final Player player, final BlockEntityType configuredType) { if (player.level().isClientSide()) { return; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/AbstractItemConstructorStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/AbstractItemConstructorStrategy.java index 30d356e43..ce2c3463e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/AbstractItemConstructorStrategy.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/AbstractItemConstructorStrategy.java @@ -50,19 +50,14 @@ public final boolean apply( return false; } final ItemStack itemStack = itemResource.toItemStack(extractedAmount); - final boolean success = apply(itemResource, itemStack, actor, actingPlayer); + final boolean success = apply(itemStack, actor, actingPlayer); if (success) { storageChannel.extract(itemResource, extractedAmount, Action.EXECUTE, actor); } return success; } - protected abstract boolean apply( - ItemResource itemResource, - ItemStack itemStack, - Actor actor, - Player actingPlayer - ); + protected abstract boolean apply(ItemStack itemStack, Actor actor, Player actingPlayer); protected double getDispensePositionX() { return pos.getX() + 0.5D; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemDropConstructorStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemDropConstructorStrategy.java index 5d531c896..bd39c7125 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemDropConstructorStrategy.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemDropConstructorStrategy.java @@ -1,7 +1,6 @@ package com.refinedmods.refinedstorage.platform.common.constructordestructor; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -30,12 +29,7 @@ protected long getTransferAmount() { } @Override - protected boolean apply( - final ItemResource itemResource, - final ItemStack itemStack, - final Actor actor, - final Player actingPlayer - ) { + protected boolean apply(final ItemStack itemStack, final Actor actor, final Player actingPlayer) { final Vec3 position = new Vec3( getDispensePositionX(), getDispensePositionY(), diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceBlockConstructorStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceBlockConstructorStrategy.java index fc9a8800c..ca95da0a8 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceBlockConstructorStrategy.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceBlockConstructorStrategy.java @@ -2,7 +2,6 @@ import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -21,12 +20,7 @@ public PlaceBlockConstructorStrategy( } @Override - protected boolean apply( - final ItemResource itemResource, - final ItemStack itemStack, - final Actor actor, - final Player actingPlayer - ) { + protected boolean apply(final ItemStack itemStack, final Actor actor, final Player actingPlayer) { if (!(itemStack.getItem() instanceof BlockItem)) { return false; } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceFireworksConstructorStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceFireworksConstructorStrategy.java index 52477ba8d..0d6c2d4a6 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceFireworksConstructorStrategy.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceFireworksConstructorStrategy.java @@ -1,7 +1,6 @@ package com.refinedmods.refinedstorage.platform.common.constructordestructor; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -21,12 +20,7 @@ public PlaceFireworksConstructorStrategy( } @Override - protected boolean apply( - final ItemResource itemResource, - final ItemStack itemStack, - final Actor actor, - final Player actingPlayer - ) { + protected boolean apply(final ItemStack itemStack, final Actor actor, final Player actingPlayer) { if (!(itemStack.getItem() instanceof FireworkRocketItem)) { return false; } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorBlock.java index c6869cef2..eee8dc9f2 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorBlock.java @@ -90,7 +90,6 @@ public MutableComponent getName() { } @Override - @SuppressWarnings("deprecation") public VoxelShape getShape(final BlockState state, final BlockGetter world, final BlockPos pos, diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorBlockEntity.java index 2e2a5bdf8..f6a077423 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorBlockEntity.java @@ -60,7 +60,7 @@ public DetectorBlockEntity(final BlockPos pos, final BlockState state) { propagateAmount(); setChanged(); }, - filters -> mainNode.setConfiguredResource(filters.isEmpty() ? null : filters.get(0)) + filters -> mainNode.setConfiguredResource(filters.isEmpty() ? null : filters.getFirst()) ); initialize(); } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorModeSettings.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorModeSettings.java index 6fe841c54..5b768fc82 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorModeSettings.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorModeSettings.java @@ -13,7 +13,6 @@ private DetectorModeSettings() { static DetectorMode getDetectorMode(final int detectorMode) { return switch (detectorMode) { case UNDER -> DetectorMode.UNDER; - case EQUAL -> DetectorMode.EQUAL; case ABOVE -> DetectorMode.ABOVE; default -> DetectorMode.EQUAL; }; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridContainerMenu.java index 01493deeb..7d08ef691 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridContainerMenu.java @@ -404,6 +404,7 @@ public boolean onTransfer(final int slotIndex) { throw new UnsupportedOperationException(); } + @SuppressWarnings("resource") @Override public ItemStack quickMoveStack(final Player playerEntity, final int slotIndex) { if (!playerEntity.level().isClientSide() && grid != null && grid.isGridActive()) { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridContainerMenu.java index cc6e73b46..b8bc7740b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridContainerMenu.java @@ -23,6 +23,7 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; +import org.apiguardian.api.API; public class CraftingGridContainerMenu extends AbstractGridContainerMenu { private static final int Y_OFFSET_BETWEEN_PLAYER_INVENTORY_AND_FIRST_CRAFTING_MATRIX_SLOT = 69; @@ -78,6 +79,7 @@ public boolean canTakeItemForPickAll(final ItemStack stack, final Slot slot) { } @Override + @SuppressWarnings("resource") public ItemStack quickMoveStack(final Player actor, final int slotIndex) { final Slot slot = getSlot(slotIndex); if (!actor.level().isClientSide() && slot instanceof CraftingGridResultSlot resultSlot) { @@ -117,6 +119,7 @@ public void clear(final boolean toPlayerInventory) { source.clearMatrix(player, toPlayerInventory); } + @API(status = API.Status.INTERNAL) public ResourceList getAvailableListForRecipeTransfer() { final ResourceList available = getView().copyBackingList(); addContainerToList(source.getCraftingMatrix(), available); @@ -142,7 +145,8 @@ public void filterBasedOnCraftingMatrixItems() { final Set craftingMatrixItems = getCraftingMatrixItems(); filterBeforeFilteringBasedOnCraftingMatrixItems = getView().setFilterAndSort( gridResource -> gridResource instanceof ItemGridResource itemGridResource - && craftingMatrixItems.contains(itemGridResource.getResource()) + && itemGridResource.getUnderlyingResource() != null + && craftingMatrixItems.contains((ItemResource) itemGridResource.getUnderlyingResource()) ); } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridResultSlot.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridResultSlot.java index db7c3bb30..72eda3aaa 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridResultSlot.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridResultSlot.java @@ -23,6 +23,7 @@ class CraftingGridResultSlot extends ResultSlot { this.source = source; } + @SuppressWarnings("resource") public ItemStack onQuickCraft(final Player player) { if (!hasItem() || player.level().isClientSide()) { return ItemStack.EMPTY; @@ -40,6 +41,7 @@ public ItemStack onQuickCraft(final Player player) { } @Override + @SuppressWarnings("resource") public void onTake(final Player player, final ItemStack stack) { if (player.level().isClientSide()) { return; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/AbstractGridScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/AbstractGridScreen.java index ccecea0d8..1f05da3bd 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/AbstractGridScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/AbstractGridScreen.java @@ -8,7 +8,6 @@ import com.refinedmods.refinedstorage.platform.api.PlatformApi; import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; import com.refinedmods.refinedstorage.platform.api.grid.view.PlatformGridResource; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; import com.refinedmods.refinedstorage.platform.common.Platform; import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; import com.refinedmods.refinedstorage.platform.common.grid.NoopGridSynchronizer; @@ -36,6 +35,7 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; +import org.apiguardian.api.API; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -354,6 +354,7 @@ private boolean isModifiedJustNow(final LastModified lastModified) { && lastModified.amount() <= MODIFIED_JUST_NOW_MAX_SECONDS; } + @API(status = API.Status.INTERNAL) @Nullable public PlatformGridResource getCurrentGridResource() { if (currentGridSlotIndex < 0) { @@ -366,12 +367,6 @@ public PlatformGridResource getCurrentGridResource() { return (PlatformGridResource) viewList.get(currentGridSlotIndex); } - @Nullable - public PlatformResourceKey getCurrentResource() { - final PlatformGridResource resource = getCurrentGridResource(); - return resource != null ? resource.getUnderlyingResource() : null; - } - @Override public void render(final GuiGraphics graphics, final int mouseX, final int mouseY, final float partialTicks) { super.render(graphics, mouseX, mouseY, partialTicks); @@ -509,7 +504,7 @@ public boolean charTyped(final char unknown1, final int unknown2) { @Override public boolean keyPressed(final int key, final int scanCode, final int modifiers) { - // First do the prevent sorting. + // First check if we have to prevent sorting. // Order matters. In auto-selected mode, the search field will swallow the SHIFT key. if (hasShiftDown() && Platform.INSTANCE.getConfig().getGrid().isPreventSortingWhileShiftIsDown()) { getMenu().getView().setPreventSorting(true); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/CableBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/CableBlock.java index 7e15780d1..b2f172125 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/CableBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/CableBlock.java @@ -65,7 +65,6 @@ public boolean propagatesSkylightDown(final BlockState state, final BlockGetter } @Override - @SuppressWarnings("deprecation") public FluidState getFluidState(final BlockState state) { return Boolean.TRUE.equals(state.getValue(BlockStateProperties.WATERLOGGED)) ? Fluids.WATER.getSource(false) @@ -73,7 +72,6 @@ public FluidState getFluidState(final BlockState state) { } @Override - @SuppressWarnings("deprecation") public BlockState updateShape(final BlockState state, final Direction direction, final BlockState newState, @@ -100,7 +98,6 @@ protected void createBlockStateDefinition(final StateDefinition.Builder AccessMode.INSERT_EXTRACT; case INSERT -> AccessMode.INSERT; case EXTRACT -> AccessMode.EXTRACT; default -> AccessMode.INSERT_EXTRACT; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/TransferModeSettings.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/TransferModeSettings.java index 3f0419cb8..da39340a3 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/TransferModeSettings.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/TransferModeSettings.java @@ -10,11 +10,10 @@ private TransferModeSettings() { } static StorageTransferMode getTransferMode(final int transferMode) { - return switch (transferMode) { - case INSERT_INTO_NETWORK -> StorageTransferMode.INSERT_INTO_NETWORK; - case EXTRACT_FROM_NETWORK -> StorageTransferMode.EXTRACT_FROM_NETWORK; - default -> StorageTransferMode.INSERT_INTO_NETWORK; - }; + if (transferMode == EXTRACT_FROM_NETWORK) { + return StorageTransferMode.EXTRACT_FROM_NETWORK; + } + return StorageTransferMode.INSERT_INTO_NETWORK; } static int getTransferMode(final StorageTransferMode transferMode) { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageBlock.java index 08b98f9a2..7244916c6 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageBlock.java @@ -71,7 +71,6 @@ public BlockEntityTicker getTicker(final Level level, } @Override - @SuppressWarnings("deprecation") public void neighborChanged(final BlockState state, final Level level, final BlockPos pos, diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java index 40f7fb483..5c2c6c4f5 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java @@ -67,7 +67,6 @@ public ExternalStorageBlockEntity(final BlockPos pos, final BlockState state) { } @Override - @SuppressWarnings("deprecation") public void setBlockState(final BlockState newBlockState) { super.setBlockState(newBlockState); if (level instanceof ServerLevel serverLevel) { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlock.java index ff77977c4..fe0c4df6a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlock.java @@ -61,7 +61,6 @@ protected DirectionType getDirectionType() { } @Override - @SuppressWarnings("deprecation") public VoxelShape getShape(final BlockState state, final BlockGetter level, final BlockPos pos, diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java index 92f42ab05..1fdbd1fc7 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java @@ -13,7 +13,6 @@ public class ItemStorageMonitorExtractionStrategy implements StorageMonitorExtractionStrategy { @Override - @SuppressWarnings("deprecation") public boolean extract(final ResourceKey resource, final boolean fullStack, final Player player, diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlock.java index ea1603d7e..1af6df35f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlock.java @@ -80,7 +80,6 @@ protected ItemInteractionResult useItemOn(final ItemStack stack, } @Override - @SuppressWarnings("deprecation") public void attack(final BlockState state, final Level level, final BlockPos pos, final Player player) { super.attack(state, level, pos, player); if (level.isClientSide()) { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseBlock.java index db3599dbd..654261089 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseBlock.java @@ -104,14 +104,12 @@ private void tryOpenScreen(final ServerPlayer player, final MenuProvider menuPro } @Override - @SuppressWarnings("deprecation") public MenuProvider getMenuProvider(final BlockState state, final Level level, final BlockPos pos) { final BlockEntity blockEntity = level.getBlockEntity(pos); return blockEntity instanceof MenuProvider provider ? provider : null; } @Override - @SuppressWarnings("deprecation") public void onRemove(final BlockState state, final Level level, final BlockPos pos, @@ -203,7 +201,6 @@ private boolean rotate(final BlockState state, return !state.equals(rotated); } - @SuppressWarnings("deprecation") protected BlockState getRotatedBlockState(final BlockState state, final Level level, final BlockPos pos) { return state.rotate(Rotation.CLOCKWISE_90); } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseScreen.java index 32e51cb6a..73100def1 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseScreen.java @@ -34,6 +34,7 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.item.ItemStack; +import org.apiguardian.api.API; import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslationAsHeading; import static java.util.Objects.requireNonNullElse; @@ -171,6 +172,7 @@ public void addSideButton(final AbstractSideButtonWidget button) { addRenderableWidget(button); } + @API(status = API.Status.INTERNAL) public List getExclusionZones() { return exclusionZones; } @@ -315,6 +317,7 @@ private boolean tryOpenResourceAmountScreen(final ResourceSlot slot) { } @Nullable + @API(status = API.Status.INTERNAL) public PlatformResourceKey getHoveredResource() { if (hoveredSlot instanceof ResourceSlot resourceSlot) { return resourceSlot.getResource(); @@ -322,10 +325,12 @@ public PlatformResourceKey getHoveredResource() { return null; } + @API(status = API.Status.INTERNAL) public int getLeftPos() { return leftPos; } + @API(status = API.Status.INTERNAL) public int getTopPos() { return topPos; } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractDirectionalCableBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractDirectionalCableBlock.java index f35442e7e..a419bb3d8 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractDirectionalCableBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractDirectionalCableBlock.java @@ -52,7 +52,6 @@ public boolean propagatesSkylightDown(final BlockState state, final BlockGetter } @Override - @SuppressWarnings("deprecation") public FluidState getFluidState(final BlockState state) { return Boolean.TRUE.equals(state.getValue(BlockStateProperties.WATERLOGGED)) ? Fluids.WATER.getSource(false) @@ -60,7 +59,6 @@ public FluidState getFluidState(final BlockState state) { } @Override - @SuppressWarnings("deprecation") public BlockState updateShape(final BlockState state, final Direction direction, final BlockState newState, @@ -100,7 +98,6 @@ protected void createBlockStateDefinition(final StateDefinition.Builder> recipe); - - void sendPropertyChange(PropertyType type, T value); - - void sendStorageInfoRequest(UUID storageId); - - void sendResourceSlotChange(int slotIndex, boolean tryAlternatives); - - void sendResourceFilterSlotChange(PlatformResourceKey resource, int slotIndex); - - void sendResourceSlotAmountChange(int slotIndex, long amount); - - void sendSingleAmountChange(double amount); - - void sendUseNetworkBoundItem(SlotReference slotReference); - - void sendSecurityCardPermission(PlatformPermission permission, boolean allowed); - - void sendSecurityCardResetPermission(PlatformPermission permission); - - void sendSecurityCardBoundPlayer(UUID playerId); -} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilterModeSettings.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilterModeSettings.java index 91047d61f..1c42e23b2 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilterModeSettings.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilterModeSettings.java @@ -10,11 +10,10 @@ private FilterModeSettings() { } public static FilterMode getFilterMode(final int filterMode) { - return switch (filterMode) { - case BLOCK -> FilterMode.BLOCK; - case ALLOW -> FilterMode.ALLOW; - default -> FilterMode.BLOCK; - }; + if (filterMode == ALLOW) { + return FilterMode.ALLOW; + } + return FilterMode.BLOCK; } public static int getFilterMode(final FilterMode filterMode) { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/RedstoneModeSettings.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/RedstoneModeSettings.java index b54098c8c..7db3531ed 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/RedstoneModeSettings.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/RedstoneModeSettings.java @@ -10,7 +10,6 @@ private RedstoneModeSettings() { public static RedstoneMode getRedstoneMode(final int redstoneMode) { return switch (redstoneMode) { - case IGNORE -> RedstoneMode.IGNORE; case HIGH -> RedstoneMode.HIGH; case LOW -> RedstoneMode.LOW; default -> RedstoneMode.IGNORE; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java index 16045b705..d33692c79 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java @@ -28,7 +28,6 @@ protected AbstractLevelInteractingNetworkNodeContainerBlockEntity( // used to handle rotations @Override - @SuppressWarnings("deprecation") public void setBlockState(final BlockState newBlockState) { super.setBlockState(newBlockState); if (!(level instanceof ServerLevel serverLevel)) { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemSessionImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemSessionImpl.java index d8fc7e9a1..131bdfdfb 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemSessionImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemSessionImpl.java @@ -53,6 +53,7 @@ public Optional resolveNetwork() { .filter(this::isInRange); } + @SuppressWarnings("resource") private boolean isInRange(final Network network) { return network.getComponent(GraphNetworkComponent.class) .getContainers(WirelessTransmitter.class) diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/C2SPackets.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/C2SPackets.java index 7575266e7..57cae248f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/C2SPackets.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/C2SPackets.java @@ -13,6 +13,8 @@ import java.util.List; import java.util.UUID; +import org.apiguardian.api.API; + public final class C2SPackets { private C2SPackets() { } @@ -53,6 +55,7 @@ public static void sendResourceSlotChange(final int slotIndex, final boolean try Platform.INSTANCE.sendPacketToServer(new ResourceSlotChangePacket(slotIndex, tryAlternatives)); } + @API(status = API.Status.INTERNAL) public static void sendResourceFilterSlotChange(final PlatformResourceKey resource, final int slotIndex) { Platform.INSTANCE.sendPacketToServer(new ResourceFilterSlotChangePacket(slotIndex, resource)); } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResource.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResource.java index adae101b7..2bc28eab4 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResource.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResource.java @@ -10,7 +10,7 @@ import net.minecraft.world.level.material.Fluid; import org.apiguardian.api.API; -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") +@API(status = API.Status.INTERNAL) public record FluidResource(Fluid fluid, DataComponentPatch components) implements PlatformResourceKey, FuzzyModeNormalizer { public FluidResource(final Fluid fluid) { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceType.java index 089155b26..3786a523e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceType.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceType.java @@ -14,7 +14,6 @@ import java.util.Optional; -import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; @@ -73,12 +72,6 @@ public MapCodec getMapCodec() { return (MapCodec) ResourceCodecs.FLUID_MAP_CODEC; } - @Override - @SuppressWarnings({"unchecked", "rawtypes"}) - public Codec getCodec() { - return (Codec) ResourceCodecs.FLUID_CODEC; - } - @Override @SuppressWarnings({"unchecked", "rawtypes"}) public StreamCodec getStreamCodec() { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResource.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResource.java index 52f987d1f..18d38fa22 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResource.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResource.java @@ -13,7 +13,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") +@API(status = API.Status.INTERNAL) public record ItemResource(Item item, DataComponentPatch components) implements PlatformResourceKey, FuzzyModeNormalizer { private static final Logger LOGGER = LoggerFactory.getLogger(ItemResource.class); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceType.java index 88fb86469..bd34688f0 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceType.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceType.java @@ -14,7 +14,6 @@ import java.util.Optional; -import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; @@ -75,12 +74,6 @@ public MapCodec getMapCodec() { return (MapCodec) ResourceCodecs.ITEM_MAP_CODEC; } - @Override - @SuppressWarnings({"unchecked", "rawtypes"}) - public Codec getCodec() { - return (Codec) ResourceCodecs.ITEM_CODEC; - } - @Override @SuppressWarnings({"unchecked", "rawtypes"}) public StreamCodec getStreamCodec() { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerSlot.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerSlot.java index e7022129b..254da8a1c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerSlot.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerSlot.java @@ -2,7 +2,6 @@ import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; import java.util.Objects; @@ -19,10 +18,6 @@ class ResourceContainerSlot { : ItemStack.EMPTY; } - long getAmount() { - return resourceAmount.getAmount(); - } - ResourceAmount getResourceAmount() { return resourceAmount; } @@ -31,10 +26,6 @@ PlatformResourceKey getPlatformResource() { return (PlatformResourceKey) resourceAmount.getResource(); } - ResourceType getResourceType() { - return getPlatformResource().getResourceType(); - } - ItemStack getStackRepresentation() { return stackRepresentation; } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/FuzzyResourceListImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/FuzzyResourceListImpl.java index c7f354030..14890b604 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/FuzzyResourceListImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/FuzzyResourceListImpl.java @@ -15,9 +15,6 @@ import java.util.Optional; import java.util.Set; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4") public class FuzzyResourceListImpl extends AbstractProxyResourceList implements FuzzyResourceList { private final Map> normalizedFuzzyMap = new HashMap<>(); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/History.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/History.java index 1c912088f..85251b476 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/History.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/History.java @@ -16,14 +16,13 @@ public String older() { } if (index == -1) { index = items.size() - 1; - return items.get(index); } else { index--; if (index < 0) { index = 0; } - return items.get(index); } + return items.get(index); } public String newer() { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/SearchFieldWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/SearchFieldWidget.java index e7c6a7b70..bd6e2a501 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/SearchFieldWidget.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/SearchFieldWidget.java @@ -72,7 +72,7 @@ private boolean shouldMoveControlToParent(final int keyCode, final boolean canLo saveHistory(); setFocused(false); // If we are autoselected, we need to move control back to the parent straight away. - // If we are not autoselected, we can just unfocus (which will require another ESC press to close). + // If we are not autoselected, we can just lose focus (which will require another ESC press to close). return !canLoseFocus; } return false; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/BuiltinUpgradeDestinationsImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/BuiltinUpgradeDestinationsImpl.java deleted file mode 100644 index 1b1b501e8..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/BuiltinUpgradeDestinationsImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.refinedmods.refinedstorage.platform.common.upgrade; - -import com.refinedmods.refinedstorage.platform.api.upgrade.BuiltinUpgradeDestinations; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeDestination; - -public class BuiltinUpgradeDestinationsImpl implements BuiltinUpgradeDestinations { - @Override - public UpgradeDestination getImporter() { - return UpgradeDestinations.IMPORTER; - } - - @Override - public UpgradeDestination getExporter() { - return UpgradeDestinations.EXPORTER; - } - - @Override - public UpgradeDestination getDestructor() { - return UpgradeDestinations.DESTRUCTOR; - } - - @Override - public UpgradeDestination getConstructor() { - return UpgradeDestinations.CONSTRUCTOR; - } - - @Override - public UpgradeDestination getWirelessTransmitter() { - return UpgradeDestinations.WIRELESS_TRANSMITTER; - } -} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeItem.java index a11139476..3a7ba006e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeItem.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeItem.java @@ -130,22 +130,11 @@ public record RegulatorTooltipComponent(Component helpText, @Nullable ResourceAm implements TooltipComponent { } - private static class ExtendedMenuProviderImpl implements ExtendedMenuProvider { - private final ResourceContainer resourceContainer; - private final double amount; - private final Consumer amountAcceptor; - private final SlotReference slotReference; - - private ExtendedMenuProviderImpl(final ResourceContainer resourceContainer, - final double amount, - final Consumer amountAcceptor, - final SlotReference slotReference) { - this.resourceContainer = resourceContainer; - this.amount = amount; - this.amountAcceptor = amountAcceptor; - this.slotReference = slotReference; - } - + private record ExtendedMenuProviderImpl(ResourceContainer resourceContainer, + double amount, + Consumer amountAcceptor, + SlotReference slotReference) + implements ExtendedMenuProvider { @Override public SingleAmountData getMenuData() { return new SingleAmountData( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeDestinations.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeDestinations.java index c33b15098..1bec06e7c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeDestinations.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeDestinations.java @@ -11,13 +11,16 @@ import net.minecraft.world.item.ItemStack; public enum UpgradeDestinations implements UpgradeDestination { - IMPORTER(ContentNames.IMPORTER, () -> new ItemStack(Items.INSTANCE.getImporters().get(0).get())), - EXPORTER(ContentNames.EXPORTER, () -> new ItemStack(Items.INSTANCE.getExporters().get(0).get())), - DESTRUCTOR(ContentNames.DESTRUCTOR, () -> new ItemStack(Items.INSTANCE.getDestructors().get(0).get())), - CONSTRUCTOR(ContentNames.CONSTRUCTOR, () -> new ItemStack(Items.INSTANCE.getConstructors().get(0).get())), - WIRELESS_TRANSMITTER(ContentNames.WIRELESS_TRANSMITTER, - () -> new ItemStack(Items.INSTANCE.getWirelessTransmitters().get(0).get())), - DISK_INTERFACE(ContentNames.DISK_INTERFACE, () -> new ItemStack(Items.INSTANCE.getDiskInterfaces().get(0).get())); + IMPORTER(ContentNames.IMPORTER, () -> new ItemStack(Items.INSTANCE.getImporters().getFirst().get())), + EXPORTER(ContentNames.EXPORTER, () -> new ItemStack(Items.INSTANCE.getExporters().getFirst().get())), + DESTRUCTOR(ContentNames.DESTRUCTOR, () -> new ItemStack(Items.INSTANCE.getDestructors().getFirst().get())), + CONSTRUCTOR(ContentNames.CONSTRUCTOR, () -> new ItemStack(Items.INSTANCE.getConstructors().getFirst().get())), + WIRELESS_TRANSMITTER(ContentNames.WIRELESS_TRANSMITTER, () -> new ItemStack( + Items.INSTANCE.getWirelessTransmitters().getFirst().get() + )), + DISK_INTERFACE(ContentNames.DISK_INTERFACE, () -> new ItemStack( + Items.INSTANCE.getDiskInterfaces().getFirst().get() + )); private final Component name; private final Supplier stackFactory; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterBlock.java index 551b26f1d..908ef036c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterBlock.java @@ -57,7 +57,6 @@ protected DirectionType getDirectionType() { } @Override - @SuppressWarnings("deprecation") public VoxelShape getShape(final BlockState state, final BlockGetter world, final BlockPos pos, diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/nl_nl.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/nl_nl.json deleted file mode 100644 index 547960d11..000000000 --- a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/nl_nl.json +++ /dev/null @@ -1,365 +0,0 @@ -{ - "itemGroup.refinedstorage.general": "Refined Storage", - "block.refinedstorage.cable": "Cable", - "block.refinedstorage.quartz_enriched_iron_block": "Block of Quartz Enriched Iron", - "block.refinedstorage.disk_drive": "Disk Drive", - "block.refinedstorage.machine_casing": "Machine Casing", - "block.refinedstorage.grid": "Grid", - "block.refinedstorage.crafting_grid": "Crafting Grid", - "block.refinedstorage.controller": "Controller", - "block.refinedstorage.controller.rei_fully_charged": "Fully charged Controller", - "block.refinedstorage.creative_controller": "Creative Controller", - "block.refinedstorage.1k_storage_block": "1K Storage Block", - "block.refinedstorage.4k_storage_block": "4K Storage Block", - "block.refinedstorage.16k_storage_block": "16K Storage Block", - "block.refinedstorage.64k_storage_block": "64K Storage Block", - "block.refinedstorage.creative_storage_block": "Creative Storage Block", - "block.refinedstorage.64b_fluid_storage_block": "64B Fluid Storage Block", - "block.refinedstorage.256b_fluid_storage_block": "256B Fluid Storage Block", - "block.refinedstorage.1024b_fluid_storage_block": "1024B Fluid Storage Block", - "block.refinedstorage.4096b_fluid_storage_block": "4096B Fluid Storage Block", - "block.refinedstorage.creative_fluid_storage_block": "Creative Fluid Storage Block", - "block.refinedstorage.importer": "Importer", - "block.refinedstorage.exporter": "Exporter", - "block.refinedstorage.interface": "Interface", - "block.refinedstorage.external_storage": "External Storage", - "block.refinedstorage.detector": "Detector", - "block.refinedstorage.constructor": "Constructor", - "block.refinedstorage.destructor": "Destructor", - "block.refinedstorage.wireless_transmitter": "Wireless Transmitter", - "block.refinedstorage.storage_monitor": "Storage Monitor", - "block.refinedstorage.network_receiver": "Network Receiver", - "block.refinedstorage.network_transmitter": "Network Transmitter", - "block.refinedstorage.portable_grid": "Portable Grid", - "block.refinedstorage.creative_portable_grid": "Creative Portable Grid", - "gui.refinedstorage.controller.redstone_mode_help": "When this device is inactive, the storage network will not be able to use this device as an energy source.", - "gui.refinedstorage.disk_drive.disks": "Disks", - "gui.refinedstorage.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.", - "gui.refinedstorage.storage.filter_help": "The resources that may or may not be allowed in this storage, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage.storage.filter_mode.empty_warning": "Without any configured filters, no resources will be accepted in this storage.", - "gui.refinedstorage.storage.filter_mode.allow.help": "Only allow resources into this storage that are configured in the filters.", - "gui.refinedstorage.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", - "gui.refinedstorage.grid.sorting.direction": "Sorting direction", - "gui.refinedstorage.grid.sorting.direction.ascending": "Ascending", - "gui.refinedstorage.grid.sorting.direction.descending": "Descending", - "gui.refinedstorage.grid.sorting.type": "Sorting type", - "gui.refinedstorage.grid.sorting.type.quantity": "Quantity", - "gui.refinedstorage.grid.sorting.type.name": "Name", - "gui.refinedstorage.grid.sorting.type.id": "ID", - "gui.refinedstorage.grid.sorting.type.last_modified": "Last modified", - "gui.refinedstorage.grid.size": "Size", - "gui.refinedstorage.grid.size.stretch": "Stretch", - "gui.refinedstorage.grid.size.small": "Small", - "gui.refinedstorage.grid.size.medium": "Medium", - "gui.refinedstorage.grid.size.large": "Large", - "gui.refinedstorage.grid.size.extra_large": "Extra large", - "gui.refinedstorage.grid.auto_selected": "Auto-selected", - "gui.refinedstorage.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", - "gui.refinedstorage.grid.synchronizer": "Synchronization mode", - "gui.refinedstorage.grid.synchronizer.off": "Off", - "gui.refinedstorage.grid.synchronizer.off.help": "Don't sync the search box text.", - "gui.refinedstorage.grid.synchronizer.jei": "JEI", - "gui.refinedstorage.grid.synchronizer.jei.help": "Sync the search box text to the JEI filter.", - "gui.refinedstorage.grid.synchronizer.jei.two_way": "JEI two-way", - "gui.refinedstorage.grid.synchronizer.jei.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text.", - "gui.refinedstorage.grid.synchronizer.rei": "REI", - "gui.refinedstorage.grid.synchronizer.rei.help": "Sync the search box text to the REI filter.", - "gui.refinedstorage.grid.synchronizer.rei.two_way": "REI two-way", - "gui.refinedstorage.grid.synchronizer.rei.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text.", - "gui.refinedstorage.grid.resource_type": "Resource type", - "gui.refinedstorage.grid.resource_type.all": "All", - "gui.refinedstorage.grid.resource_type.help": "Filter specific resource types.", - "gui.refinedstorage.crafting_grid.move.network": "Move items to network", - "gui.refinedstorage.crafting_grid.move.inventory": "Move items to inventory", - "gui.refinedstorage.detector.mode": "Mode", - "gui.refinedstorage.detector.mode.under": "Emit redstone signal when under the amount", - "gui.refinedstorage.detector.mode.equal": "Emit redstone signal when on the amount", - "gui.refinedstorage.detector.mode.above": "Emit redstone signal when above the amount", - "gui.refinedstorage.detector.filter_help": "The resource that should be detected in the storage network.", - "gui.refinedstorage.destructor.pickup_items": "Pickup items instead of breaking", - "gui.refinedstorage.destructor.filter_help": "The blocks that may or may not be destroyed, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage.destructor.filter_mode.allow.help": "Only allow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage.constructor.drop_items": "Drop items instead of placing blocks", - "gui.refinedstorage.constructor.filter_help": "The resources that should be placed from the storage network.", - "gui.refinedstorage.interface.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage.exporter.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage.importer.filter_help": "The resources that may be imported from the target inventory.", - "gui.refinedstorage.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", - "gui.refinedstorage.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", - "gui.refinedstorage.wireless_transmitter.distance": "%d block(s)", - "gui.refinedstorage.storage_monitor.filter_help": "The resource to display.", - "gui.refinedstorage.redstone_mode": "Redstone mode", - "gui.refinedstorage.redstone_mode.ignore": "Ignore", - "gui.refinedstorage.redstone_mode.ignore.help": "This device will always be active, regardless of redstone signal.", - "gui.refinedstorage.redstone_mode.high": "High", - "gui.refinedstorage.redstone_mode.high.help": "This device will only be active with a redstone signal.", - "gui.refinedstorage.redstone_mode.low": "Low", - "gui.refinedstorage.redstone_mode.low.help": "This device will only be active without a redstone signal.", - "gui.refinedstorage.scheduling_mode": "Scheduling mode", - "gui.refinedstorage.scheduling_mode.default": "Default", - "gui.refinedstorage.scheduling_mode.default.help": "Use the first available filter.", - "gui.refinedstorage.scheduling_mode.round_robin": "Round robin", - "gui.refinedstorage.scheduling_mode.round_robin.help": "Use each filter in turn.", - "gui.refinedstorage.scheduling_mode.random": "Random", - "gui.refinedstorage.scheduling_mode.random.help": "Use a random filter.", - "gui.refinedstorage.priority": "Priority", - "gui.refinedstorage.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", - "gui.refinedstorage.amount": "Amount", - "gui.refinedstorage.amount.reset": "Reset", - "gui.refinedstorage.amount.set": "Set", - "gui.refinedstorage.filter_mode": "Filter mode", - "gui.refinedstorage.filter_mode.allow": "Allowlist", - "gui.refinedstorage.filter_mode.block": "Blocklist", - "gui.refinedstorage.fuzzy_mode": "Fuzzy mode", - "gui.refinedstorage.fuzzy_mode.on": "On", - "gui.refinedstorage.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", - "gui.refinedstorage.fuzzy_mode.on.generic_help": "Match the filter exactly.", - "gui.refinedstorage.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", - "gui.refinedstorage.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", - "gui.refinedstorage.fuzzy_mode.off": "Off", - "gui.refinedstorage.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", - "gui.refinedstorage.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", - "gui.refinedstorage.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", - "gui.refinedstorage.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", - "gui.refinedstorage.access_mode": "Access mode", - "gui.refinedstorage.access_mode.insert_extract": "Insert and extract", - "gui.refinedstorage.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", - "gui.refinedstorage.access_mode.insert": "Insert only", - "gui.refinedstorage.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", - "gui.refinedstorage.access_mode.extract": "Extract only", - "gui.refinedstorage.access_mode.extract.help": "The storage network will only be able to extract from this storage.", - "gui.refinedstorage.void_excess": "Void excess resources", - "gui.refinedstorage.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", - "gui.refinedstorage.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", - "gui.refinedstorage.upgrade_slot": "Empty upgrade slot", - "gui.refinedstorage.filter_slot.empty_filter": "Empty filter", - "gui.refinedstorage.filter_slot.left_click_for": "Left click for", - "gui.refinedstorage.filter_slot.right_click_for": "Right click for", - "gui.refinedstorage.filter_slot.click_to_clear": "Click to clear", - "gui.refinedstorage.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", - "gui.refinedstorage.network_transmitter.status.inactive": "Inactive", - "gui.refinedstorage.network_transmitter.status.missing_network_card": "Missing Network Card", - "gui.refinedstorage.network_transmitter.status.transmitting": "%d block(s)", - "gui.refinedstorage.network_transmitter.status.receiver_unreachable": "Unreachable", - "item.refinedstorage.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", - "item.refinedstorage.creative_controller.help": "Provides the storage network with an infinite source of energy.", - "item.refinedstorage.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", - "item.refinedstorage.grid.help": "Allows for interacting with the storage network.", - "item.refinedstorage.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", - "item.refinedstorage.importer.help": "Imports resources from an external source to the storage network.", - "item.refinedstorage.exporter.help": "Exports resources from the storage network to an external destination.", - "item.refinedstorage.interface.help": "Acts as the combination of an Importer and Exporter.", - "item.refinedstorage.external_storage.help": "Provides the storage network with storage from an external source.", - "item.refinedstorage.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", - "item.refinedstorage.constructor.help": "Places blocks from the storage network in the world.", - "item.refinedstorage.destructor.help": "Destroys blocks from the world and puts them in the storage network.", - "item.refinedstorage.quartz_enriched_iron": "Quartz Enriched Iron", - "item.refinedstorage.processor_binding": "Processor Binding", - "item.refinedstorage.silicon": "Silicon", - "item.refinedstorage.raw_basic_processor": "Raw Basic Processor", - "item.refinedstorage.raw_improved_processor": "Raw Improved Processor", - "item.refinedstorage.raw_advanced_processor": "Raw Advanced Processor", - "item.refinedstorage.basic_processor": "Basic Processor", - "item.refinedstorage.improved_processor": "Improved Processor", - "item.refinedstorage.advanced_processor": "Advanced Processor", - "item.refinedstorage.1k_storage_part": "1K Storage Part", - "item.refinedstorage.4k_storage_part": "4K Storage Part", - "item.refinedstorage.16k_storage_part": "16K Storage Part", - "item.refinedstorage.64k_storage_part": "64K Storage Part", - "item.refinedstorage.1k_storage_disk": "1K Storage Disk", - "item.refinedstorage.4k_storage_disk": "4K Storage Disk", - "item.refinedstorage.16k_storage_disk": "16K Storage Disk", - "item.refinedstorage.64k_storage_disk": "64K Storage Disk", - "item.refinedstorage.creative_storage_disk": "Creative Storage Disk", - "item.refinedstorage.64b_fluid_storage_part": "64B Fluid Storage Part", - "item.refinedstorage.256b_fluid_storage_part": "256B Fluid Storage Part", - "item.refinedstorage.1024b_fluid_storage_part": "1024B Fluid Storage Part", - "item.refinedstorage.4096b_fluid_storage_part": "4096B Fluid Storage Part", - "item.refinedstorage.64b_fluid_storage_disk": "64B Fluid Storage Disk", - "item.refinedstorage.256b_fluid_storage_disk": "256B Fluid Storage Disk", - "item.refinedstorage.1024b_fluid_storage_disk": "1024B Fluid Storage Disk", - "item.refinedstorage.4096b_fluid_storage_disk": "4096B Fluid Storage Disk", - "item.refinedstorage.creative_fluid_storage_disk": "Creative Fluid Storage Disk", - "item.refinedstorage.storage_housing": "Storage Housing", - "item.refinedstorage.construction_core": "Construction Core", - "item.refinedstorage.destruction_core": "Destruction Core", - "item.refinedstorage.wrench": "Wrench", - "item.refinedstorage.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", - "item.refinedstorage.upgrade": "Upgrade", - "item.refinedstorage.speed_upgrade": "Speed Upgrade", - "item.refinedstorage.stack_upgrade": "Stack Upgrade", - "item.refinedstorage.silk_touch_upgrade": "Silk Touch Upgrade", - "item.refinedstorage.fortune_upgrade.1": "Fortune I Upgrade", - "item.refinedstorage.fortune_upgrade.2": "Fortune II Upgrade", - "item.refinedstorage.fortune_upgrade.3": "Fortune III Upgrade", - "item.refinedstorage.regulator_upgrade": "Regulator Upgrade", - "item.refinedstorage.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", - "item.refinedstorage.range_upgrade": "Range Upgrade", - "item.refinedstorage.creative_range_upgrade": "Creative Range Upgrade", - "item.refinedstorage.wireless_grid": "Wireless Grid", - "item.refinedstorage.creative_wireless_grid": "Creative Wireless Grid", - "item.refinedstorage.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", - "item.refinedstorage.network_item.unbound": "Unbound.", - "item.refinedstorage.network_item.unbound.help": "Use on any storage network device to bind.", - "item.refinedstorage.network_item.bound_to": "Bound to %d, %d, %d.", - "item.refinedstorage.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", - "item.refinedstorage.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", - "item.refinedstorage.configuration_card": "Configuration Card", - "item.refinedstorage.configuration_card.empty": "Empty.", - "item.refinedstorage.configuration_card.configured": "Contains configuration for %s.", - "item.refinedstorage.configuration_card.copied_configuration": "Copied configuration for %s.", - "item.refinedstorage.configuration_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", - "item.refinedstorage.configuration_card.applied_configuration": "Applied configuration.", - "item.refinedstorage.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", - "item.refinedstorage.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", - "item.refinedstorage.network_card": "Network Card", - "item.refinedstorage.network_card.unbound_help": "Use while crouching on a Network Receiver.", - "item.refinedstorage.network_card.unbound": "Unbound.", - "item.refinedstorage.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", - "item.refinedstorage.network_card.bound": "Bound to %d, %d, %d in %s.", - "misc.refinedstorage.stored": "Stored: %s", - "misc.refinedstorage.stored_with_capacity": "Stored: %s / %s (%d%%)", - "misc.refinedstorage.total": "%d total", - "misc.refinedstorage.last_modified.just_now": "Last modified just now by %s", - "misc.refinedstorage.last_modified.second": "Last modified %d second ago by %s", - "misc.refinedstorage.last_modified.seconds": "Last modified %d seconds ago by %s", - "misc.refinedstorage.last_modified.minute": "Last modified %d minute ago by %s", - "misc.refinedstorage.last_modified.minutes": "Last modified %d minutes ago by %s", - "misc.refinedstorage.last_modified.hour": "Last modified %d hour ago by %s", - "misc.refinedstorage.last_modified.hours": "Last modified %d hours ago by %s", - "misc.refinedstorage.last_modified.day": "Last modified %d day ago by %s", - "misc.refinedstorage.last_modified.days": "Last modified %d days ago by %s", - "misc.refinedstorage.last_modified.week": "Last modified %d week ago by %s", - "misc.refinedstorage.last_modified.weeks": "Last modified %d weeks ago by %s", - "misc.refinedstorage.last_modified.year": "Last modified %d year ago by %s", - "misc.refinedstorage.last_modified.years": "Last modified %d years ago by %s", - "misc.refinedstorage.resource_type.item": "Item", - "misc.refinedstorage.resource_type.fluid": "Fluid", - "misc.refinedstorage.press_shift_for_help": "Press SHIFT for help", - "key.refinedstorage.focus_search_bar": "Focus search bar", - "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", - "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", - "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", - "refinedstorage.subtitle.wrench": "Wrench used", - "category.refinedstorage.key_bindings": "Refined Storage", - "text.autoconfig.refinedstorage.title": "Refined Storage", - "text.autoconfig.refinedstorage.option.grid": "Grid", - "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", - "text.autoconfig.refinedstorage.option.grid.maxRowsStretch": "Maximum amount of rows when stretched", - "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", - "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", - "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", - "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage.option.grid.smoothScrolling": "Smooth scrolling", - "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", - "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", - "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sorting direction", - "text.autoconfig.refinedstorage.option.grid.sortingType": "Sorting type", - "text.autoconfig.refinedstorage.option.grid.size": "Size", - "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", - "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", - "text.autoconfig.refinedstorage.option.controller": "Controller", - "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage.option.cable": "Cable", - "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", - "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", - "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", - "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", - "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", - "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", - "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", - "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", - "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", - "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", - "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", - "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage.option.importer": "Importer", - "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage.option.exporter": "Exporter", - "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage.option.detector": "Detector", - "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage.option.constructor": "Constructor", - "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage.option.destructor": "Destructor", - "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", - "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", - "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", - "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", - "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", - "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", - "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", - "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", - "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", - "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", - "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", - "text.autoconfig.refinedstorage.option.iface": "Interface", - "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage.option.externalStorage": "External Storage", - "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", - "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", - "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", - "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", - "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", - "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", - "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", - "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", - "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a network to provide your network with energy", - "advancements.refinedstorage.connecting": "Connecting", - "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", - "advancements.refinedstorage.drives": "Drives", - "advancements.refinedstorage.drives.description": "Craft a Disk Drive to be able to store your storage disks", - "advancements.refinedstorage.storing_items": "Storing items", - "advancements.refinedstorage.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage.viewing_your_storage": "Viewing your storage", - "advancements.refinedstorage.viewing_your_storage.description": "Craft a Grid to interact with your storage", - "advancements.refinedstorage.upgrading_your_grid": "Upgrading your Grid", - "advancements.refinedstorage.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", - "advancements.refinedstorage.storing_fluids": "Storing fluids", - "advancements.refinedstorage.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage.importing": "Importing", - "advancements.refinedstorage.importing.description": "Get resources into the storage network with an Importer", - "advancements.refinedstorage.exporting": "Exporting", - "advancements.refinedstorage.exporting.description": "Get resources out of the storage network with an Exporter", - "advancements.refinedstorage.upgrading": "Upgrading", - "advancements.refinedstorage.upgrading.description": "Craft an Upgrade to improve various devices", - "advancements.refinedstorage.interface_to_the_world": "Interface to the world", - "advancements.refinedstorage.interface_to_the_world.description": "Export and import items at the same time with an Interface", - "advancements.refinedstorage.storing_externally": "Storing externally", - "advancements.refinedstorage.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", - "advancements.refinedstorage.detecting": "Detecting", - "advancements.refinedstorage.detecting.description": "Use redstone to check resources stored in the network", - "advancements.refinedstorage.construction": "Construction", - "advancements.refinedstorage.construction.description": "Get blocks from the storage network into the world with a Constructor", - "advancements.refinedstorage.destruction": "Destruction", - "advancements.refinedstorage.destruction.description": "Get blocks from in the world into the storage network with a Destructor", - "advancements.refinedstorage.wireless": "Wireless", - "advancements.refinedstorage.wireless.description": "Access your resources wirelessly with a Wireless Grid.", - "advancements.refinedstorage.better_than_a_barrel": "Better than a barrel", - "advancements.refinedstorage.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", - "advancements.refinedstorage.no_cables_required": "No cables required", - "advancements.refinedstorage.no_cables_required.description": "Add extra components to your network without using cables by using a Network Transmitter, Network Receiver and Network Card", - "advancements.refinedstorage.portable_storage": "Portable storage", - "advancements.refinedstorage.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network" -} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_full.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_full.json index 49923d184..b2eba9f3c 100644 --- a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_full.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_full.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "textures": { "base": "refinedstorage:block/disk/leds" }, diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_near_capacity.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_near_capacity.json index eb0650629..41ebfbe2a 100644 --- a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_near_capacity.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_near_capacity.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "textures": { "base": "refinedstorage:block/disk/leds" }, diff --git a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/registry/PlatformRegistryImplTest.java b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/registry/PlatformRegistryImplTest.java index 104b7cda0..12fc3db13 100644 --- a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/registry/PlatformRegistryImplTest.java +++ b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/registry/PlatformRegistryImplTest.java @@ -43,6 +43,7 @@ void shouldNotBeAbleToModifyUnderlyingRegistryList() { } @Test + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug void shouldRegisterAndRetrieve() { // Act sut.register(A, 10); diff --git a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/FuzzyResourceListImplTest.java b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/FuzzyResourceListImplTest.java index 83de1f629..49ff58b57 100644 --- a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/FuzzyResourceListImplTest.java +++ b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/FuzzyResourceListImplTest.java @@ -37,6 +37,7 @@ void setUp() { } @Test + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug void testRetrievingFuzzy() { // Arrange sut.add(DUMMY_A, 5); @@ -92,6 +93,7 @@ void testRetrievingFuzzy() { } @Test + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug void shouldRemoveEntireResourceFromFuzzyIndexAfterRemoval() { // Arrange sut.add(DUMMY_A, 5); @@ -137,6 +139,7 @@ void shouldRemoveEntireResourceFromFuzzyIndexAfterRemoval() { } @Test + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug void shouldRemoveSingleResourceFromFuzzyIndexAfterRemoval() { // Arrange sut.add(DUMMY_A, 5); diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ConfigImpl.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ConfigImpl.java index 92ea07790..f10d2e48e 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ConfigImpl.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ConfigImpl.java @@ -15,6 +15,7 @@ import me.shedaniel.autoconfig.annotation.ConfigEntry; import net.minecraft.resources.ResourceLocation; +@SuppressWarnings({"FieldCanBeLocal", "FieldMayBeFinal", "CanBeFinal"}) @Config(name = IdentifierUtil.MOD_ID) public class ConfigImpl implements ConfigData, com.refinedmods.refinedstorage.platform.common.Config { private ScreenSize screenSize = ScreenSize.STRETCH; @@ -328,7 +329,7 @@ public void setAutoSelected(final boolean autoSelected) { @Override public Optional getSynchronizer() { - if (synchronizer == null || synchronizer.trim().isBlank()) { + if (synchronizer.trim().isBlank()) { return Optional.empty(); } return Optional.of(synchronizer).map(ResourceLocation::tryParse); @@ -370,7 +371,7 @@ public void setSortingType(final GridSortingTypes sortingType) { @Override public Optional getResourceTypeId() { - if (resourceTypeId == null || resourceTypeId.trim().isBlank()) { + if (resourceTypeId.trim().isBlank()) { return Optional.empty(); } return Optional.of(resourceTypeId).map(ResourceLocation::tryParse); diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ModInitializerImpl.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ModInitializerImpl.java index fb864b9a3..6ccf93436 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ModInitializerImpl.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ModInitializerImpl.java @@ -250,6 +250,7 @@ private void registerContent() { registerBlockEntities( new DirectRegistryCallback<>(BuiltInRegistries.BLOCK_ENTITY_TYPE), new BlockEntityTypeFactory() { + @SuppressWarnings("DataFlowIssue") // data type can be null @Override public BlockEntityType create(final BlockEntitySupplier factory, final Block... allowedBlocks) { diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveTransform.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveTransform.java index f90d173c0..7f202de27 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveTransform.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveTransform.java @@ -24,6 +24,7 @@ public boolean transform(final MutableQuadView quad) { return true; } + @SuppressWarnings("resource") private void doTransform(final MutableQuadView quad) { final SpriteFinder finder = SpriteFinder.get(getAtlas()); if (finder == null) { diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadRotator.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadRotator.java index bf9e5cf55..0748b28cb 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadRotator.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadRotator.java @@ -49,9 +49,9 @@ public boolean transform(final MutableQuadView quad) { if (cullFace != null) { quad.cullFace(rotate(cullFace, mat)); } - - quad.nominalFace(rotate(nominalFace, mat)); - + if (nominalFace != null) { + quad.nominalFace(rotate(nominalFace, mat)); + } return true; } diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ConfigImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ConfigImpl.java index e8f4bbe5a..5b52468f1 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ConfigImpl.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ConfigImpl.java @@ -435,7 +435,7 @@ public void setAutoSelected(final boolean autoSelected) { @Override public Optional getSynchronizer() { - if (synchronizer == null || synchronizer.get().trim().isBlank()) { + if (synchronizer.get().trim().isBlank()) { return Optional.empty(); } return Optional.of(synchronizer.get()).map(ResourceLocation::tryParse); @@ -473,7 +473,7 @@ public void setSortingType(final GridSortingTypes sortingType) { @Override public Optional getResourceTypeId() { - if (resourceType == null || resourceType.get().trim().isBlank()) { + if (resourceType.get().trim().isBlank()) { return Optional.empty(); } return Optional.of(resourceType.get()).map(ResourceLocation::tryParse); diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ModInitializer.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ModInitializer.java index 97d07acf3..32c6ce5a7 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ModInitializer.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ModInitializer.java @@ -318,6 +318,7 @@ private void registerBlockEntities(final IEventBus eventBus) { registerBlockEntities( new ForgeRegistryCallback<>(blockEntityTypeRegistry), new BlockEntityTypeFactory() { + @SuppressWarnings("DataFlowIssue") // data type can be null @Override public BlockEntityType create(final BlockEntitySupplier factory, final Block... allowedBlocks) { diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/PlatformImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/PlatformImpl.java index 898babd8c..79e0b7ad2 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/PlatformImpl.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/PlatformImpl.java @@ -325,7 +325,7 @@ public Optional getEnergyStorage(final ItemStack stack) { return Optional.ofNullable(stack.getCapability(Capabilities.EnergyStorage.ITEM)) .filter(EnergyStorageAdapter.class::isInstance) .map(EnergyStorageAdapter.class::cast) - .map(EnergyStorageAdapter::getEnergyStorage); + .map(EnergyStorageAdapter::energyStorage); } @Override diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/energy/EnergyStorageAdapter.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/energy/EnergyStorageAdapter.java index 35ff1effa..3fb7b9a86 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/energy/EnergyStorageAdapter.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/energy/EnergyStorageAdapter.java @@ -5,17 +5,7 @@ import net.neoforged.neoforge.energy.IEnergyStorage; -public class EnergyStorageAdapter implements IEnergyStorage { - private final EnergyStorage energyStorage; - - public EnergyStorageAdapter(final EnergyStorage energyStorage) { - this.energyStorage = energyStorage; - } - - public EnergyStorage getEnergyStorage() { - return energyStorage; - } - +public record EnergyStorageAdapter(EnergyStorage energyStorage) implements IEnergyStorage { @Override public int receiveEnergy(final int maxReceive, final boolean simulate) { return (int) energyStorage.receive(maxReceive, simulate ? Action.SIMULATE : Action.EXECUTE); diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/RotationTranslationModelBaker.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/RotationTranslationModelBaker.java index ace1123b3..1ab96ec25 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/RotationTranslationModelBaker.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/RotationTranslationModelBaker.java @@ -20,16 +20,16 @@ public class RotationTranslationModelBaker { private final ModelState state; private final ModelBaker baker; - private final Function spriterGetter; + private final Function spriteGetter; private final ResourceLocation model; public RotationTranslationModelBaker(final ModelState state, final ModelBaker baker, - final Function spriterGetter, + final Function spriteGetter, final ResourceLocation model) { this.state = state; this.baker = baker; - this.spriterGetter = spriterGetter; + this.spriteGetter = spriteGetter; this.model = model; } @@ -38,7 +38,7 @@ public List bake(final Transformation transformation, @Nullable final Direction side, final RandomSource rand) { final ModelState wrappedState = new SimpleModelState(transformation, state.isUvLocked()); - final BakedModel bakedModel = baker.bake(model, wrappedState, spriterGetter); + final BakedModel bakedModel = baker.bake(model, wrappedState, spriteGetter); if (bakedModel == null) { return new ArrayList<>(); } diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/GameTestUtil.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/GameTestUtil.java index 22d5a5561..c2d0b5fea 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/GameTestUtil.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/GameTestUtil.java @@ -87,9 +87,6 @@ public static T requireBlockEntity( final Class clazz ) { final BlockEntity blockEntity = helper.getBlockEntity(pos); - if (blockEntity == null) { - throw new GameTestAssertException("Block entity not found at " + pos); - } if (!clazz.isInstance(blockEntity)) { throw new GameTestAssertException( "Expected block entity of type " + clazz + " but was " + blockEntity.getClass() diff --git a/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/Parser.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/Parser.java index 14b583868..bc283637b 100644 --- a/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/Parser.java +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/Parser.java @@ -78,7 +78,7 @@ private Node parseParen() { final Token currentAfterExpression = currentOrNull(); if (currentAfterExpression == null) { - throw new ParserException("Expected ')'", tokens.get(tokens.size() - 1)); + throw new ParserException("Expected ')'", tokens.getLast()); } if (currentAfterExpression.type() == TokenType.PAREN_CLOSE diff --git a/refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/lexer/LexerTest.java b/refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/lexer/LexerTest.java index 50cd0101e..341479880 100644 --- a/refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/lexer/LexerTest.java +++ b/refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/lexer/LexerTest.java @@ -42,7 +42,7 @@ void testSingleIdentifier() { // Assert assertThat(tokens).hasSize(1); - final Token token = tokens.get(0); + final Token token = tokens.getFirst(); assertToken(token, "hel1lo", TokenType.IDENTIFIER); assertPosition(token.position(), SOURCE_NAME, 1, 1, 1, 6); } @@ -55,7 +55,7 @@ void testMultipleIdentifiers() { // Assert assertThat(tokens).hasSize(3); - final Token hello = tokens.get(0); + final Token hello = tokens.getFirst(); assertToken(hello, "hello", TokenType.IDENTIFIER); assertPosition(hello.position(), SOURCE_NAME, 1, 1, 1, 5); @@ -76,7 +76,7 @@ void testSingleStringIdentifier() { // Assert assertThat(tokens).hasSize(1); - final Token token = tokens.get(0); + final Token token = tokens.getFirst(); assertToken(token, "h_el1lo", TokenType.IDENTIFIER); assertPosition(token.position(), SOURCE_NAME, 1, 1, 1, 9); } @@ -89,7 +89,7 @@ void testMultipleStringIdentifiers() { // Assert assertThat(tokens).hasSize(3); - final Token hello = tokens.get(0); + final Token hello = tokens.getFirst(); assertToken(hello, "hello", TokenType.IDENTIFIER); assertPosition(hello.position(), SOURCE_NAME, 1, 1, 1, 7); @@ -103,14 +103,14 @@ void testMultipleStringIdentifiers() { } @Test - void testEmptyStirngIdentifier() { + void testEmptyStringIdentifier() { // Act final List tokens = getTokens("\"\""); // Assert assertThat(tokens).hasSize(1); - final Token text = tokens.get(0); + final Token text = tokens.getFirst(); assertToken(text, "", TokenType.IDENTIFIER); assertPosition(text.position(), SOURCE_NAME, 1, 1, 1, 2); } @@ -133,7 +133,7 @@ void testNewLines() { // Assert assertThat(tokens).hasSize(4); - final Token hello = tokens.get(0); + final Token hello = tokens.getFirst(); assertToken(hello, "hello", TokenType.IDENTIFIER); assertPosition(hello.position(), SOURCE_NAME, 1, 1, 1, 5); @@ -158,7 +158,7 @@ void testIntegerNumber() { // Assert assertThat(tokens).hasSize(1); - final Token token = tokens.get(0); + final Token token = tokens.getFirst(); assertToken(token, "123", TokenType.INTEGER_NUMBER); assertPosition(token.position(), SOURCE_NAME, 1, 1, 1, 3); } @@ -171,7 +171,7 @@ void testFloatingNumber() { // Assert assertThat(tokens).hasSize(1); - final Token token = tokens.get(0); + final Token token = tokens.getFirst(); assertToken(token, "123.45", TokenType.FLOATING_NUMBER); assertPosition(token.position(), SOURCE_NAME, 1, 1, 1, 6); } @@ -209,7 +209,7 @@ void testTokenMappings() { assertThat(tokens).hasSize(9); - assertToken(tokens.get(0), "(", TokenType.PAREN_OPEN); + assertToken(tokens.getFirst(), "(", TokenType.PAREN_OPEN); assertToken(tokens.get(1), ")", TokenType.PAREN_CLOSE); assertToken(tokens.get(2), "+", TokenType.BIN_OP); assertToken(tokens.get(3), "-", TokenType.BIN_OP); @@ -219,7 +219,7 @@ void testTokenMappings() { assertToken(tokens.get(7), "&&", TokenType.BIN_OP); assertToken(tokens.get(8), "||", TokenType.BIN_OP); - assertPosition(tokens.get(0).position(), SOURCE_NAME, 1, 1, 1, 1); + assertPosition(tokens.getFirst().position(), SOURCE_NAME, 1, 1, 1, 1); assertPosition(tokens.get(1).position(), SOURCE_NAME, 1, 2, 1, 2); assertPosition(tokens.get(2).position(), SOURCE_NAME, 1, 3, 1, 3); assertPosition(tokens.get(3).position(), SOURCE_NAME, 1, 4, 1, 4); diff --git a/refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/parser/ParserTest.java b/refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/parser/ParserTest.java index 5f3001696..6cf950b59 100644 --- a/refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/parser/ParserTest.java +++ b/refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/parser/ParserTest.java @@ -26,7 +26,7 @@ void testIdentifierLiteral() { // Assert assertThat(nodes).hasSize(1); - assertThat(nodes.get(0)).hasToString("hello"); + assertThat(nodes.getFirst()).hasToString("hello"); } @Test @@ -39,7 +39,7 @@ void testNumberLiteral() { // Assert assertThat(nodes).hasSize(2); - assertThat(nodes.get(0)).hasToString("1"); + assertThat(nodes.getFirst()).hasToString("1"); assertThat(nodes.get(1)).hasToString("2.345"); } @@ -54,7 +54,7 @@ void testSimpleBinaryOperator() { // Assert assertThat(nodes).hasSize(1); - assertThat(nodes.get(0)).hasToString("(1 + 2)"); + assertThat(nodes.getFirst()).hasToString("(1 + 2)"); } @Test @@ -72,7 +72,7 @@ void testLeftToRightBinaryOperatorAssociativity() { // Assert assertThat(nodes).hasSize(1); - assertThat(nodes.get(0)).hasToString("(((1 + 2) + 3) + 4)"); + assertThat(nodes.getFirst()).hasToString("(((1 + 2) + 3) + 4)"); } @Test @@ -90,7 +90,7 @@ void testRightToLeftBinaryOperatorAssociativity() { // Assert assertThat(nodes).hasSize(1); - assertThat(nodes.get(0)).hasToString("(1 ^ (2 ^ (3 ^ 4)))"); + assertThat(nodes.getFirst()).hasToString("(1 ^ (2 ^ (3 ^ 4)))"); } @Test @@ -114,7 +114,7 @@ void testBinaryOperatorAssociativity() { // Assert assertThat(nodes).hasSize(1); - assertThat(nodes.get(0)).hasToString("(((1 + 2) + 3) + (4 * (5 ^ (6 ^ 7))))"); + assertThat(nodes.getFirst()).hasToString("(((1 + 2) + 3) + (4 * (5 ^ (6 ^ 7))))"); } @Test @@ -134,7 +134,7 @@ void testBinaryOperatorPrecedence() { // Assert assertThat(nodes).hasSize(1); - assertThat(nodes.get(0)).hasToString("(x = ((1 + (2 * 3)) + 4))"); + assertThat(nodes.getFirst()).hasToString("(x = ((1 + (2 * 3)) + 4))"); } @Test @@ -152,7 +152,7 @@ void testLogicalOperatorPrecedence() { // Assert assertThat(nodes).hasSize(1); - assertThat(nodes.get(0)).hasToString("((x && y) || (z && a))"); + assertThat(nodes.getFirst()).hasToString("((x && y) || (z && a))"); } @Test @@ -173,7 +173,7 @@ void testUnaryOperators() { // Assert assertThat(nodes).hasSize(3); - assertThat(nodes.get(0)).hasToString("!true"); + assertThat(nodes.getFirst()).hasToString("!true"); assertThat(nodes.get(1)).hasToString("++x"); assertThat(nodes.get(2)).hasToString("!((x && y))"); } @@ -202,7 +202,7 @@ void testParenthesis() { // Assert assertThat(nodes).hasSize(1); - assertThat(nodes.get(0)).hasToString("(1)"); + assertThat(nodes.getFirst()).hasToString("(1)"); } @Test @@ -226,7 +226,7 @@ void testNestedParenthesis() { // Assert assertThat(nodes).hasSize(1); - assertThat(nodes.get(0)).hasToString("(((1 + (1 * ((2 ^ 4))))))"); + assertThat(nodes.getFirst()).hasToString("(((1 + (1 * ((2 ^ 4))))))"); } @Test @@ -274,7 +274,7 @@ void testMultipleExpressionsInParenthesis() { // Assert final List nodes = builder.getNodes(); assertThat(nodes).hasSize(1); - assertThat(nodes.get(0)).hasToString("(a b)"); + assertThat(nodes.getFirst()).hasToString("(a b)"); } @Test diff --git a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/TransferHelperTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/TransferHelperTest.java index ef7a787ba..633034084 100644 --- a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/TransferHelperTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/TransferHelperTest.java @@ -273,12 +273,12 @@ void shouldNotTransferInvalidAmount() { assertThrows(NullPointerException.class, action3); } - record Transfer(@Nullable ResourceAmount amountInSource, - @Nullable ResourceAmount amountInDestination, - ResourceAmount amountToTransfer, - long amountExpectedToBeTransferred, - @Nullable ResourceAmount amountExpectedAfterTransferInSource, - @Nullable ResourceAmount amountExpectedAfterTransferInDestination) { + public record Transfer(@Nullable ResourceAmount amountInSource, + @Nullable ResourceAmount amountInDestination, + ResourceAmount amountToTransfer, + long amountExpectedToBeTransferred, + @Nullable ResourceAmount amountExpectedAfterTransferInSource, + @Nullable ResourceAmount amountExpectedAfterTransferInDestination) { } public static class TransferBuilder { diff --git a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImplTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImplTest.java index aac9d49cc..5fadc5baf 100644 --- a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImplTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImplTest.java @@ -228,6 +228,7 @@ void shouldBeAbleToRetrieveResource() { } @Test + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug void shouldBeAbleToRetrieveTrackedResource() { // Arrange final Storage storage = new TrackedStorageImpl( diff --git a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/composite/CompositeStorageImplTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/composite/CompositeStorageImplTest.java index 2086629f6..db2dcbfc4 100644 --- a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/composite/CompositeStorageImplTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/composite/CompositeStorageImplTest.java @@ -204,6 +204,7 @@ void shouldOnlyRespectPriorityWhenSortingSourcesExplicitlyWhenChangingPriorityAf assertThat(storage2.getStored()).isEqualTo(2); } + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug @Test void shouldFindMostRecentChange() { // Arrange diff --git a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorageImplTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorageImplTest.java index 38820558d..f41a038cc 100644 --- a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorageImplTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorageImplTest.java @@ -136,6 +136,7 @@ void shouldNotTrackResourceByInsertingToAlreadyFullStorage(final Action action) @ParameterizedTest @EnumSource(Action.class) + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug void shouldTrackResourceByExtracting(final Action action) { // Arrange backed.insert(A, 100, Action.EXECUTE, EmptyActor.INSTANCE); @@ -172,6 +173,7 @@ void shouldNotTrackResourceByExtractingNothing(final Action action) { } @Test + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug void shouldTrackMultipleResources() { // Act sut.insert(A, 1, Action.EXECUTE, FakeActors.FakeActor1.INSTANCE); @@ -193,6 +195,7 @@ void shouldTrackMultipleResources() { class UpdateTrackedResourceTest { @ParameterizedTest @EnumSource(Action.class) + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug void shouldUpdateTrackedResourceByInserting(final Action action) { // Act sut.insert(A, 50, Action.EXECUTE, FakeActors.FakeActor1.INSTANCE); @@ -214,6 +217,7 @@ void shouldUpdateTrackedResourceByInserting(final Action action) { @ParameterizedTest @EnumSource(Action.class) + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug void shouldNotUpdateTrackedResourceByInsertingToAnAlreadyFullStorage(final Action action) { // Act sut.insert(A, 100, Action.EXECUTE, FakeActors.FakeActor1.INSTANCE); @@ -228,6 +232,7 @@ void shouldNotUpdateTrackedResourceByInsertingToAnAlreadyFullStorage(final Actio @ParameterizedTest @EnumSource(Action.class) + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug void shouldUpdateTrackedResourceByExtracting(final Action action) { // Arrange backed.insert(A, 100, Action.EXECUTE, EmptyActor.INSTANCE); @@ -252,6 +257,7 @@ void shouldUpdateTrackedResourceByExtracting(final Action action) { @ParameterizedTest @EnumSource(Action.class) + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug void shouldNotUpdateTrackedResourceByExtractingNothing(final Action action) { // Arrange backed.insert(A, 100, Action.EXECUTE, EmptyActor.INSTANCE); @@ -268,6 +274,7 @@ void shouldNotUpdateTrackedResourceByExtractingNothing(final Action action) { } @Test + @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug void shouldBeAbleToUpdateMultipleTrackedResources() { // Act sut.insert(A, 1, Action.EXECUTE, FakeActors.FakeActor1.INSTANCE); diff --git a/settings.gradle.kts b/settings.gradle.kts index 19f3b009f..a35275d32 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -10,7 +10,7 @@ dependencyResolutionManagement { } versionCatalogs { create("libs") { - from("com.refinedmods.refinedarchitect:refinedarchitect-versioning:0.16.4") + from("com.refinedmods.refinedarchitect:refinedarchitect-versioning:0.16.6") } } } @@ -36,11 +36,11 @@ pluginManagement { } } plugins { - id("refinedarchitect.root").version("0.16.4") - id("refinedarchitect.base").version("0.16.4") - id("refinedarchitect.common").version("0.16.4") - id("refinedarchitect.neoforge").version("0.16.4") - id("refinedarchitect.fabric").version("0.16.4") + id("refinedarchitect.root").version("0.16.6") + id("refinedarchitect.base").version("0.16.6") + id("refinedarchitect.common").version("0.16.6") + id("refinedarchitect.neoforge").version("0.16.6") + id("refinedarchitect.fabric").version("0.16.6") } } From 611fb7a34f2ec6e07697b61560d16b2cde4a4b6d Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 17 Jul 2024 15:49:50 +0200 Subject: [PATCH 05/36] refactor: cleanup duplication around storage types --- .../common/AbstractClientModInitializer.java | 8 +- .../common/AbstractModInitializer.java | 24 ++--- .../common/content/BlockEntities.java | 20 ++--- .../platform/common/content/Blocks.java | 20 ++--- .../platform/common/content/ContentIds.java | 16 ++-- .../common/content/CreativeModeTabItems.java | 20 ++--- .../platform/common/content/Items.java | 36 ++++---- .../common/storage/FluidStorageType.java | 89 ------------------- .../common/storage/FluidStorageVariant.java | 43 +++++++++ .../common/storage/ItemStorageType.java | 80 ----------------- .../common/storage/ItemStorageVariant.java | 33 +++++++ .../common/storage/SameTypeStorageType.java | 78 ++++++++++++++++ .../common/storage/StorageCodecs.java | 4 +- .../platform/common/storage/StorageTypes.java | 43 ++++----- .../storageblock/FluidStorageBlock.java | 6 +- .../FluidStorageBlockBlockEntity.java | 8 +- .../FluidStorageBlockBlockItem.java | 10 +-- .../storageblock/ItemStorageBlock.java | 6 +- .../ItemStorageBlockBlockEntity.java | 8 +- .../ItemStorageBlockBlockItem.java | 8 +- .../storagedisk/FluidStorageDiskItem.java | 10 +-- .../storagedisk/ItemStorageDiskItem.java | 8 +- .../datagen/tag/ItemTagsProviderImpl.java | 12 +-- .../ConstructorTestPlots.java | 8 +- .../DestructorTestPlots.java | 8 +- .../common/exporter/ExporterTestPlots.java | 8 +- .../common/importer/ImporterTestPlots.java | 8 +- 27 files changed, 300 insertions(+), 322 deletions(-) delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/FluidStorageType.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/FluidStorageVariant.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/ItemStorageType.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/ItemStorageVariant.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/SameTypeStorageType.java diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractClientModInitializer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractClientModInitializer.java index 4cebb7e41..4612068f4 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractClientModInitializer.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractClientModInitializer.java @@ -21,8 +21,8 @@ import com.refinedmods.refinedstorage.platform.common.security.FallbackSecurityCardScreen; import com.refinedmods.refinedstorage.platform.common.security.SecurityCardScreen; import com.refinedmods.refinedstorage.platform.common.security.SecurityManagerScreen; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.DiskDriveScreen; import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.DiskInterfaceScreen; import com.refinedmods.refinedstorage.platform.common.storage.externalstorage.ExternalStorageScreen; @@ -113,7 +113,7 @@ protected static void handleInputEvents() { protected static void registerDiskModels() { final ResourceLocation diskModel = createIdentifier("block/disk/disk"); - for (final ItemStorageType.Variant variant : ItemStorageType.Variant.values()) { + for (final ItemStorageVariant variant : ItemStorageVariant.values()) { PlatformApi.INSTANCE.getStorageContainerItemHelper().registerDiskModel( Items.INSTANCE.getItemStorageDisk(variant), diskModel @@ -121,7 +121,7 @@ protected static void registerDiskModels() { } final ResourceLocation fluidDiskModel = createIdentifier("block/disk/fluid_disk"); - for (final FluidStorageType.Variant variant : FluidStorageType.Variant.values()) { + for (final FluidStorageVariant variant : FluidStorageVariant.values()) { PlatformApi.INSTANCE.getStorageContainerItemHelper().registerDiskModel( Items.INSTANCE.getFluidStorageDisk(variant), fluidDiskModel diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractModInitializer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractModInitializer.java index fe1d3361f..345124bd1 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractModInitializer.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractModInitializer.java @@ -78,8 +78,8 @@ import com.refinedmods.refinedstorage.platform.common.security.SecurityCardPermissions; import com.refinedmods.refinedstorage.platform.common.security.SecurityManagerBlockEntity; import com.refinedmods.refinedstorage.platform.common.security.SecurityManagerContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; import com.refinedmods.refinedstorage.platform.common.storage.StorageTypes; import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.DiskDriveBlock; @@ -336,13 +336,13 @@ protected final void registerBlocks( callback.register(DISK_DRIVE, () -> new DiskDriveBlock(diskDriveBlockEntityFactory)) ); Blocks.INSTANCE.setMachineCasing(callback.register(MACHINE_CASING, SimpleBlock::new)); - for (final ItemStorageType.Variant variant : ItemStorageType.Variant.values()) { + for (final ItemStorageVariant variant : ItemStorageVariant.values()) { Blocks.INSTANCE.setItemStorageBlock(variant, callback.register( forItemStorageBlock(variant), () -> new ItemStorageBlock(variant) )); } - for (final FluidStorageType.Variant variant : FluidStorageType.Variant.values()) { + for (final FluidStorageVariant variant : FluidStorageVariant.values()) { Blocks.INSTANCE.setFluidStorageBlock(variant, callback.register( forFluidStorageBlock(variant), () -> new FluidStorageBlock(variant) @@ -436,17 +436,17 @@ private void registerProcessor(final RegistryCallback callback, final Proc } private void registerStorageItems(final RegistryCallback callback) { - for (final ItemStorageType.Variant variant : ItemStorageType.Variant.values()) { + for (final ItemStorageVariant variant : ItemStorageVariant.values()) { registerItemStorageItems(callback, variant); } - for (final FluidStorageType.Variant variant : FluidStorageType.Variant.values()) { + for (final FluidStorageVariant variant : FluidStorageVariant.values()) { registerFluidStorageItems(callback, variant); } } private void registerItemStorageItems(final RegistryCallback callback, - final ItemStorageType.Variant variant) { - if (variant != ItemStorageType.Variant.CREATIVE) { + final ItemStorageVariant variant) { + if (variant != ItemStorageVariant.CREATIVE) { Items.INSTANCE.setItemStoragePart(variant, callback.register( forItemStoragePart(variant), SimpleItem::new) @@ -463,8 +463,8 @@ private void registerItemStorageItems(final RegistryCallback callback, } private void registerFluidStorageItems(final RegistryCallback callback, - final FluidStorageType.Variant variant) { - if (variant != FluidStorageType.Variant.CREATIVE) { + final FluidStorageVariant variant) { + if (variant != FluidStorageVariant.CREATIVE) { Items.INSTANCE.setFluidStoragePart(variant, callback.register( forFluidStoragePart(variant), SimpleItem::new) @@ -602,7 +602,7 @@ protected final void registerBlockEntities( CRAFTING_GRID, () -> typeFactory.create(CraftingGridBlockEntity::new, Blocks.INSTANCE.getCraftingGrid().toArray()) )); - for (final ItemStorageType.Variant variant : ItemStorageType.Variant.values()) { + for (final ItemStorageVariant variant : ItemStorageVariant.values()) { BlockEntities.INSTANCE.setItemStorageBlock(variant, callback.register( forItemStorageBlock(variant), () -> typeFactory.create( @@ -611,7 +611,7 @@ protected final void registerBlockEntities( ) )); } - for (final FluidStorageType.Variant variant : FluidStorageType.Variant.values()) { + for (final FluidStorageVariant variant : FluidStorageVariant.values()) { BlockEntities.INSTANCE.setFluidStorageBlock(variant, callback.register( forFluidStorageBlock(variant), () -> typeFactory.create( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockEntities.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockEntities.java index 668b65a4d..b61b29386 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockEntities.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockEntities.java @@ -14,8 +14,8 @@ import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterBlockEntity; import com.refinedmods.refinedstorage.platform.common.networking.RelayBlockEntity; import com.refinedmods.refinedstorage.platform.common.security.SecurityManagerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; import com.refinedmods.refinedstorage.platform.common.storage.externalstorage.ExternalStorageBlockEntity; @@ -50,10 +50,10 @@ public final class BlockEntities { private Supplier> controller; @Nullable private Supplier> creativeController; - private final Map>> - itemStorageBlocks = new EnumMap<>(ItemStorageType.Variant.class); - private final Map>> - fluidStorageBlocks = new EnumMap<>(FluidStorageType.Variant.class); + private final Map>> + itemStorageBlocks = new EnumMap<>(ItemStorageVariant.class); + private final Map>> + fluidStorageBlocks = new EnumMap<>(FluidStorageVariant.class); @Nullable private Supplier> importer; @Nullable @@ -140,21 +140,21 @@ public void setCreativeController(final Supplier> supplier) { itemStorageBlocks.put(variant, supplier); } - public BlockEntityType getItemStorageBlock(final ItemStorageType.Variant variant) { + public BlockEntityType getItemStorageBlock(final ItemStorageVariant variant) { return itemStorageBlocks.get(variant).get(); } - public void setFluidStorageBlock(final FluidStorageType.Variant variant, + public void setFluidStorageBlock(final FluidStorageVariant variant, final Supplier> supplier) { fluidStorageBlocks.put(variant, supplier); } - public BlockEntityType getFluidStorageBlock(final FluidStorageType.Variant variant) { + public BlockEntityType getFluidStorageBlock(final FluidStorageVariant variant) { return fluidStorageBlocks.get(variant).get(); } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Blocks.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Blocks.java index b81e21c95..45231593d 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Blocks.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Blocks.java @@ -19,8 +19,8 @@ import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterBlock; import com.refinedmods.refinedstorage.platform.common.networking.RelayBlock; import com.refinedmods.refinedstorage.platform.common.security.SecurityManagerBlock; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.DiskDriveBlock; import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.DiskInterfaceBlock; @@ -167,10 +167,10 @@ public final class Blocks { private Supplier diskDrive; @Nullable private Supplier machineCasing; - private final Map> itemStorageBlocks = - new EnumMap<>(ItemStorageType.Variant.class); - private final Map> fluidStorageBlocks = - new EnumMap<>(FluidStorageType.Variant.class); + private final Map> itemStorageBlocks = + new EnumMap<>(ItemStorageVariant.class); + private final Map> fluidStorageBlocks = + new EnumMap<>(FluidStorageVariant.class); @Nullable private Supplier iface; @Nullable @@ -237,20 +237,20 @@ public void setMachineCasing(final Supplier machineCasingSupplier) this.machineCasing = machineCasingSupplier; } - public void setItemStorageBlock(final ItemStorageType.Variant variant, final Supplier supplier) { + public void setItemStorageBlock(final ItemStorageVariant variant, final Supplier supplier) { itemStorageBlocks.put(variant, supplier); } - public ItemStorageBlock getItemStorageBlock(final ItemStorageType.Variant variant) { + public ItemStorageBlock getItemStorageBlock(final ItemStorageVariant variant) { return itemStorageBlocks.get(variant).get(); } - public void setFluidStorageBlock(final FluidStorageType.Variant variant, + public void setFluidStorageBlock(final FluidStorageVariant variant, final Supplier supplier) { fluidStorageBlocks.put(variant, supplier); } - public FluidStorageBlock getFluidStorageBlock(final FluidStorageType.Variant variant) { + public FluidStorageBlock getFluidStorageBlock(final FluidStorageVariant variant) { return fluidStorageBlocks.get(variant).get(); } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ContentIds.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ContentIds.java index 74091a182..280b795c4 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ContentIds.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ContentIds.java @@ -1,8 +1,8 @@ package com.refinedmods.refinedstorage.platform.common.content; import com.refinedmods.refinedstorage.platform.common.misc.ProcessorItem; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; import net.minecraft.resources.ResourceLocation; @@ -67,19 +67,19 @@ public final class ContentIds { private ContentIds() { } - public static ResourceLocation forItemStoragePart(final ItemStorageType.Variant variant) { + public static ResourceLocation forItemStoragePart(final ItemStorageVariant variant) { return createIdentifier(variant.getName() + "_storage_part"); } - public static ResourceLocation forItemStorageBlock(final ItemStorageType.Variant variant) { + public static ResourceLocation forItemStorageBlock(final ItemStorageVariant variant) { return createIdentifier(variant.getName() + "_storage_block"); } - public static ResourceLocation forFluidStoragePart(final FluidStorageType.Variant variant) { + public static ResourceLocation forFluidStoragePart(final FluidStorageVariant variant) { return createIdentifier(variant.getName() + "_fluid_storage_part"); } - public static ResourceLocation forFluidStorageBlock(final FluidStorageType.Variant variant) { + public static ResourceLocation forFluidStorageBlock(final FluidStorageVariant variant) { return createIdentifier(variant.getName() + "_fluid_storage_block"); } @@ -87,11 +87,11 @@ public static ResourceLocation forProcessor(final ProcessorItem.Type type) { return createIdentifier(type.getName() + "_processor"); } - public static ResourceLocation forStorageDisk(final ItemStorageType.Variant variant) { + public static ResourceLocation forStorageDisk(final ItemStorageVariant variant) { return createIdentifier(variant.getName() + "_storage_disk"); } - public static ResourceLocation forFluidStorageDisk(final FluidStorageType.Variant variant) { + public static ResourceLocation forFluidStorageDisk(final FluidStorageVariant variant) { return createIdentifier(variant.getName() + "_fluid_storage_disk"); } } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/CreativeModeTabItems.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/CreativeModeTabItems.java index 23d829a47..e331aa620 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/CreativeModeTabItems.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/CreativeModeTabItems.java @@ -1,8 +1,8 @@ package com.refinedmods.refinedstorage.platform.common.content; import com.refinedmods.refinedstorage.platform.common.misc.ProcessorItem; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; import java.util.Arrays; import java.util.function.Consumer; @@ -42,10 +42,10 @@ private static void appendBlocks(final Consumer consumer) { itemConsumer.accept(Items.INSTANCE.getCreativePortableGrid()); Items.INSTANCE.getDetectors().stream().map(Supplier::get).forEach(itemConsumer); itemConsumer.accept(Blocks.INSTANCE.getInterface()); - Arrays.stream(ItemStorageType.Variant.values()).forEach(variant -> itemConsumer.accept( + Arrays.stream(ItemStorageVariant.values()).forEach(variant -> itemConsumer.accept( Blocks.INSTANCE.getItemStorageBlock(variant) )); - Arrays.stream(FluidStorageType.Variant.values()).forEach(variant -> itemConsumer.accept( + Arrays.stream(FluidStorageVariant.values()).forEach(variant -> itemConsumer.accept( Blocks.INSTANCE.getFluidStorageBlock(variant) )); itemConsumer.accept(Blocks.INSTANCE.getMachineCasing()); @@ -76,19 +76,19 @@ private static void appendItems(final Consumer consumer) { itemConsumer.accept(Items.INSTANCE.getConstructionCore()); itemConsumer.accept(Items.INSTANCE.getDestructionCore()); - Arrays.stream(ItemStorageType.Variant.values()) - .filter(variant -> variant != ItemStorageType.Variant.CREATIVE) + Arrays.stream(ItemStorageVariant.values()) + .filter(variant -> variant != ItemStorageVariant.CREATIVE) .map(Items.INSTANCE::getItemStoragePart) .forEach(itemConsumer); - Arrays.stream(FluidStorageType.Variant.values()) - .filter(variant -> variant != FluidStorageType.Variant.CREATIVE) + Arrays.stream(FluidStorageVariant.values()) + .filter(variant -> variant != FluidStorageVariant.CREATIVE) .map(Items.INSTANCE::getFluidStoragePart) .forEach(itemConsumer); - Arrays.stream(ItemStorageType.Variant.values()).forEach(variant -> itemConsumer.accept( + Arrays.stream(ItemStorageVariant.values()).forEach(variant -> itemConsumer.accept( Items.INSTANCE.getItemStorageDisk(variant) )); - Arrays.stream(FluidStorageType.Variant.values()).forEach(variant -> itemConsumer.accept( + Arrays.stream(FluidStorageVariant.values()).forEach(variant -> itemConsumer.accept( Items.INSTANCE.getFluidStorageDisk(variant) )); itemConsumer.accept(Items.INSTANCE.getStorageHousing()); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Items.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Items.java index df4f724a3..4e74e7b9b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Items.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Items.java @@ -7,8 +7,8 @@ import com.refinedmods.refinedstorage.platform.common.misc.ProcessorItem; import com.refinedmods.refinedstorage.platform.common.security.FallbackSecurityCardItem; import com.refinedmods.refinedstorage.platform.common.security.SecurityCardItem; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlockItem; import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; @@ -27,14 +27,14 @@ public final class Items { public static final Items INSTANCE = new Items(); - private final Map> itemStorageParts - = new EnumMap<>(ItemStorageType.Variant.class); - private final Map> fluidStorageParts - = new EnumMap<>(FluidStorageType.Variant.class); - private final Map> itemStorageDisks - = new EnumMap<>(ItemStorageType.Variant.class); - private final Map> fluidStorageDisks - = new EnumMap<>(FluidStorageType.Variant.class); + private final Map> itemStorageParts + = new EnumMap<>(ItemStorageVariant.class); + private final Map> fluidStorageParts + = new EnumMap<>(FluidStorageVariant.class); + private final Map> itemStorageDisks + = new EnumMap<>(ItemStorageVariant.class); + private final Map> fluidStorageDisks + = new EnumMap<>(FluidStorageVariant.class); private final List> allControllers = new ArrayList<>(); private final List> allCreativeControllers = new ArrayList<>(); private final List> allCables = new ArrayList<>(); @@ -107,35 +107,35 @@ public final class Items { private Items() { } - public Item getItemStoragePart(final ItemStorageType.Variant variant) { + public Item getItemStoragePart(final ItemStorageVariant variant) { return itemStorageParts.get(variant).get(); } - public void setItemStoragePart(final ItemStorageType.Variant variant, final Supplier supplier) { + public void setItemStoragePart(final ItemStorageVariant variant, final Supplier supplier) { itemStorageParts.put(variant, supplier); } - public Item getItemStorageDisk(final ItemStorageType.Variant variant) { + public Item getItemStorageDisk(final ItemStorageVariant variant) { return itemStorageDisks.get(variant).get(); } - public void setItemStorageDisk(final ItemStorageType.Variant variant, final Supplier supplier) { + public void setItemStorageDisk(final ItemStorageVariant variant, final Supplier supplier) { itemStorageDisks.put(variant, supplier); } - public Item getFluidStoragePart(final FluidStorageType.Variant type) { + public Item getFluidStoragePart(final FluidStorageVariant type) { return fluidStorageParts.get(type).get(); } - public void setFluidStoragePart(final FluidStorageType.Variant variant, final Supplier supplier) { + public void setFluidStoragePart(final FluidStorageVariant variant, final Supplier supplier) { fluidStorageParts.put(variant, supplier); } - public Item getFluidStorageDisk(final FluidStorageType.Variant variant) { + public Item getFluidStorageDisk(final FluidStorageVariant variant) { return fluidStorageDisks.get(variant).get(); } - public void setFluidStorageDisk(final FluidStorageType.Variant variant, final Supplier supplier) { + public void setFluidStorageDisk(final FluidStorageVariant variant, final Supplier supplier) { fluidStorageDisks.put(variant, supplier); } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/FluidStorageType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/FluidStorageType.java deleted file mode 100644 index e68d49576..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/FluidStorageType.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.refinedmods.refinedstorage.platform.common.storage; - -import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage.platform.api.storage.StorageType; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; - -import javax.annotation.Nullable; - -import com.mojang.serialization.MapCodec; - -public class FluidStorageType implements StorageType { - FluidStorageType() { - } - - @Override - public SerializableStorage create(@Nullable final Long capacity, final Runnable listener) { - return StorageTypes.createHomogeneousStorage( - StorageTypes.FLUID, - StorageCodecs.StorageData.empty(capacity), - listener - ); - } - - @Override - public MapCodec getMapCodec(final Runnable listener) { - return StorageCodecs.homogeneousStorageData( - ResourceCodecs.FLUID_CODEC - ).xmap(storageData -> StorageTypes.createHomogeneousStorage( - StorageTypes.FLUID, - storageData, - listener - ), storage -> StorageCodecs.StorageData.ofHomogeneousStorage( - storage, - FluidStorageType.this::isAllowed, - FluidResource.class::cast - )); - } - - @Override - public boolean isAllowed(final ResourceKey resource) { - return resource instanceof FluidResource; - } - - @Override - public long getDiskInterfaceTransferQuota(final boolean stackUpgrade) { - return stackUpgrade ? Platform.INSTANCE.getBucketAmount() * 16 : Platform.INSTANCE.getBucketAmount(); - } - - public enum Variant { - SIXTY_FOUR_B("64b", 64L), - TWO_HUNDRED_FIFTY_SIX_B("256b", 256L), - THOUSAND_TWENTY_FOUR_B("1024b", 1024L), - FOUR_THOUSAND_NINETY_SIX_B("4096b", 4096L), - CREATIVE("creative", null); - - private final String name; - @Nullable - private final Long capacityInBuckets; - - Variant(final String name, @Nullable final Long capacityInBuckets) { - this.name = name; - this.capacityInBuckets = capacityInBuckets; - } - - public String getName() { - return name; - } - - @Nullable - public Long getCapacityInBuckets() { - return capacityInBuckets; - } - - @Nullable - public Long getCapacity() { - if (capacityInBuckets == null) { - return null; - } - return capacityInBuckets * Platform.INSTANCE.getBucketAmount(); - } - - public boolean hasCapacity() { - return capacityInBuckets != null; - } - } -} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/FluidStorageVariant.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/FluidStorageVariant.java new file mode 100644 index 000000000..c841e2f51 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/FluidStorageVariant.java @@ -0,0 +1,43 @@ +package com.refinedmods.refinedstorage.platform.common.storage; + +import com.refinedmods.refinedstorage.platform.common.Platform; + +import javax.annotation.Nullable; + +public enum FluidStorageVariant { + SIXTY_FOUR_B("64b", 64L), + TWO_HUNDRED_FIFTY_SIX_B("256b", 256L), + THOUSAND_TWENTY_FOUR_B("1024b", 1024L), + FOUR_THOUSAND_NINETY_SIX_B("4096b", 4096L), + CREATIVE("creative", null); + + private final String name; + @Nullable + private final Long capacityInBuckets; + + FluidStorageVariant(final String name, @Nullable final Long capacityInBuckets) { + this.name = name; + this.capacityInBuckets = capacityInBuckets; + } + + public String getName() { + return name; + } + + @Nullable + public Long getCapacityInBuckets() { + return capacityInBuckets; + } + + @Nullable + public Long getCapacity() { + if (capacityInBuckets == null) { + return null; + } + return capacityInBuckets * Platform.INSTANCE.getBucketAmount(); + } + + public boolean hasCapacity() { + return capacityInBuckets != null; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/ItemStorageType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/ItemStorageType.java deleted file mode 100644 index a1d8db5c1..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/ItemStorageType.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.refinedmods.refinedstorage.platform.common.storage; - -import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage.platform.api.storage.StorageType; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; - -import javax.annotation.Nullable; - -import com.mojang.serialization.MapCodec; - -public class ItemStorageType implements StorageType { - ItemStorageType() { - } - - @Override - public SerializableStorage create(@Nullable final Long capacity, final Runnable listener) { - return StorageTypes.createHomogeneousStorage( - StorageTypes.ITEM, - StorageCodecs.StorageData.empty(capacity), - listener - ); - } - - @Override - public MapCodec getMapCodec(final Runnable listener) { - return StorageCodecs.homogeneousStorageData( - ResourceCodecs.ITEM_CODEC - ).xmap(storageData -> StorageTypes.createHomogeneousStorage( - StorageTypes.ITEM, - storageData, - listener - ), storage -> StorageCodecs.StorageData.ofHomogeneousStorage( - storage, - ItemStorageType.this::isAllowed, - ItemResource.class::cast - )); - } - - @Override - public boolean isAllowed(final ResourceKey resource) { - return resource instanceof ItemResource; - } - - @Override - public long getDiskInterfaceTransferQuota(final boolean stackUpgrade) { - return stackUpgrade ? 64 : 1; - } - - public enum Variant { - ONE_K("1k", 1024L), - FOUR_K("4k", 1024 * 4L), - SIXTEEN_K("16k", 1024 * 4 * 4L), - SIXTY_FOUR_K("64k", 1024 * 4 * 4 * 4L), - CREATIVE("creative", null); - - private final String name; - @Nullable - private final Long capacity; - - Variant(final String name, @Nullable final Long capacity) { - this.name = name; - this.capacity = capacity; - } - - public String getName() { - return name; - } - - @Nullable - public Long getCapacity() { - return capacity; - } - - public boolean hasCapacity() { - return capacity != null; - } - } -} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/ItemStorageVariant.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/ItemStorageVariant.java new file mode 100644 index 000000000..17c691d2b --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/ItemStorageVariant.java @@ -0,0 +1,33 @@ +package com.refinedmods.refinedstorage.platform.common.storage; + +import javax.annotation.Nullable; + +public enum ItemStorageVariant { + ONE_K("1k", 1024L), + FOUR_K("4k", 1024 * 4L), + SIXTEEN_K("16k", 1024 * 4 * 4L), + SIXTY_FOUR_K("64k", 1024 * 4 * 4 * 4L), + CREATIVE("creative", null); + + private final String name; + @Nullable + private final Long capacity; + + ItemStorageVariant(final String name, @Nullable final Long capacity) { + this.name = name; + this.capacity = capacity; + } + + public String getName() { + return name; + } + + @Nullable + public Long getCapacity() { + return capacity; + } + + public boolean hasCapacity() { + return capacity != null; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/SameTypeStorageType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/SameTypeStorageType.java new file mode 100644 index 000000000..60d3d0c75 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/SameTypeStorageType.java @@ -0,0 +1,78 @@ +package com.refinedmods.refinedstorage.platform.common.storage; + +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.api.storage.tracked.InMemoryTrackedStorageRepository; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageImpl; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageRepository; +import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.platform.api.storage.StorageType; + +import java.util.function.Function; +import java.util.function.Predicate; +import javax.annotation.Nullable; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; + +public class SameTypeStorageType implements StorageType { + private final Codec codec; + private final Predicate valid; + private final Function caster; + private final long diskInterfaceTransferQuota; + private final long diskInterfaceTransferQuotaWithStackUpgrade; + + public SameTypeStorageType(final Codec codec, + final Predicate valid, + final Function caster, + final long diskInterfaceTransferQuota, + final long diskInterfaceTransferQuotaWithStackUpgrade) { + this.codec = codec; + this.valid = valid; + this.caster = caster; + this.diskInterfaceTransferQuota = diskInterfaceTransferQuota; + this.diskInterfaceTransferQuotaWithStackUpgrade = diskInterfaceTransferQuotaWithStackUpgrade; + } + + @Override + public SerializableStorage create(@Nullable final Long capacity, final Runnable listener) { + return createStorage(StorageCodecs.StorageData.empty(capacity), listener); + } + + @Override + public MapCodec getMapCodec(final Runnable listener) { + return StorageCodecs.sameTypeStorageData(codec).xmap( + storageData -> createStorage(storageData, listener), + storage -> StorageCodecs.StorageData.ofSameTypeStorage(storage, valid, caster) + ); + } + + @Override + public boolean isAllowed(final ResourceKey resource) { + return valid.test(resource); + } + + @Override + public long getDiskInterfaceTransferQuota(final boolean stackUpgrade) { + if (stackUpgrade) { + return diskInterfaceTransferQuotaWithStackUpgrade; + } + return diskInterfaceTransferQuota; + } + + private SerializableStorage createStorage(final StorageCodecs.StorageData data, final Runnable listener) { + final TrackedStorageRepository trackingRepository = new InMemoryTrackedStorageRepository(); + final TrackedStorageImpl tracked = new TrackedStorageImpl( + new InMemoryStorageImpl(), + trackingRepository, + System::currentTimeMillis + ); + final PlatformStorage storage = data.capacity().map(capacity -> { + final LimitedStorageImpl limited = new LimitedStorageImpl(tracked, capacity); + return (PlatformStorage) new LimitedPlatformStorage(limited, this, trackingRepository, listener); + }).orElseGet(() -> new PlatformStorage(tracked, this, trackingRepository, listener)); + data.resources().forEach(storage::load); + return storage; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageCodecs.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageCodecs.java index 217938b6e..20c9ae196 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageCodecs.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageCodecs.java @@ -40,7 +40,7 @@ public final class StorageCodecs { private StorageCodecs() { } - static MapCodec> homogeneousStorageData(final Codec resourceCodec) { + static MapCodec> sameTypeStorageData(final Codec resourceCodec) { final Codec> storageResourceCodec = RecordCodecBuilder.create(instance -> instance.group( resourceCodec.fieldOf("resource").forGetter(StorageResource::resource), Codec.LONG.fieldOf("amount").forGetter(StorageResource::amount), @@ -58,7 +58,7 @@ static StorageData empty(@Nullable final Long capacit return new StorageData<>(Optional.ofNullable(capacity), List.of()); } - static StorageData ofHomogeneousStorage( + static StorageData ofSameTypeStorage( final Storage storage, final Predicate valid, final Function caster diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageTypes.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageTypes.java index 9dcea3419..ee6feb7da 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageTypes.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageTypes.java @@ -1,34 +1,27 @@ package com.refinedmods.refinedstorage.platform.common.storage; -import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage.api.storage.tracked.InMemoryTrackedStorageRepository; -import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageImpl; -import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageRepository; import com.refinedmods.refinedstorage.platform.api.storage.StorageType; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; public final class StorageTypes { - public static final StorageType ITEM = new ItemStorageType(); - public static final StorageType FLUID = new FluidStorageType(); + public static final StorageType ITEM = new SameTypeStorageType<>( + ResourceCodecs.ITEM_CODEC, + ItemResource.class::isInstance, + ItemResource.class::cast, + 1, + 64 + ); + public static final StorageType FLUID = new SameTypeStorageType<>( + ResourceCodecs.FLUID_CODEC, + FluidResource.class::isInstance, + FluidResource.class::cast, + Platform.INSTANCE.getBucketAmount(), + Platform.INSTANCE.getBucketAmount() * 16 + ); private StorageTypes() { } - - static PlatformStorage createHomogeneousStorage(final StorageType type, - final StorageCodecs.StorageData data, - final Runnable listener) { - final TrackedStorageRepository trackingRepository = new InMemoryTrackedStorageRepository(); - final TrackedStorageImpl tracked = new TrackedStorageImpl( - new InMemoryStorageImpl(), - trackingRepository, - System::currentTimeMillis - ); - final PlatformStorage storage = data.capacity().map(capacity -> { - final LimitedStorageImpl limited = new LimitedStorageImpl(tracked, capacity); - return (PlatformStorage) new LimitedPlatformStorage(limited, type, trackingRepository, listener); - }).orElseGet(() -> new PlatformStorage(tracked, type, trackingRepository, listener)); - data.resources().forEach(storage::load); - return storage; - } } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlock.java index a718fcfab..d462026f8 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlock.java @@ -2,7 +2,7 @@ import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; import net.minecraft.core.BlockPos; @@ -10,9 +10,9 @@ import net.minecraft.world.level.block.state.BlockState; public class FluidStorageBlock extends AbstractStorageBlock { - private final FluidStorageType.Variant variant; + private final FluidStorageVariant variant; - public FluidStorageBlock(final FluidStorageType.Variant variant) { + public FluidStorageBlock(final FluidStorageVariant variant) { super( BlockConstants.PROPERTIES, new NetworkNodeBlockEntityTicker<>(() -> BlockEntities.INSTANCE.getFluidStorageBlock(variant)) diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockBlockEntity.java index a80ef93d2..f8bd13ccf 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockBlockEntity.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; import com.refinedmods.refinedstorage.platform.common.Platform; import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; import com.refinedmods.refinedstorage.platform.common.storage.StorageTypes; import net.minecraft.core.BlockPos; @@ -18,12 +18,12 @@ import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class FluidStorageBlockBlockEntity extends AbstractStorageBlockBlockEntity { - private final FluidStorageType.Variant variant; + private final FluidStorageVariant variant; private final Component displayName; public FluidStorageBlockBlockEntity(final BlockPos pos, final BlockState state, - final FluidStorageType.Variant variant) { + final FluidStorageVariant variant) { super( BlockEntities.INSTANCE.getFluidStorageBlock(variant), pos, @@ -38,7 +38,7 @@ public FluidStorageBlockBlockEntity(final BlockPos pos, ); } - private static long getEnergyUsage(final FluidStorageType.Variant variant) { + private static long getEnergyUsage(final FluidStorageVariant variant) { return switch (variant) { case SIXTY_FOUR_B -> Platform.INSTANCE.getConfig().getFluidStorageBlock().get64bEnergyUsage(); case TWO_HUNDRED_FIFTY_SIX_B -> Platform.INSTANCE.getConfig().getFluidStorageBlock().get256bEnergyUsage(); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockBlockItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockBlockItem.java index afb1675c5..6a7f3fc1f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockBlockItem.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockBlockItem.java @@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; import com.refinedmods.refinedstorage.platform.common.content.Blocks; import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceRendering; import java.util.Optional; @@ -26,10 +26,10 @@ public class FluidStorageBlockBlockItem extends AbstractStorageContainerBlockItem { private static final Component CREATIVE_HELP = createTranslation("item", "creative_fluid_storage_block.help"); - private final FluidStorageType.Variant variant; + private final FluidStorageVariant variant; private final Component helpText; - public FluidStorageBlockBlockItem(final Block block, final FluidStorageType.Variant variant) { + public FluidStorageBlockBlockItem(final Block block, final FluidStorageVariant variant) { super( block, new Item.Properties().stacksTo(1).fireResistant(), @@ -39,7 +39,7 @@ public FluidStorageBlockBlockItem(final Block block, final FluidStorageType.Vari this.helpText = getHelpText(variant); } - private static Component getHelpText(final FluidStorageType.Variant variant) { + private static Component getHelpText(final FluidStorageVariant variant) { if (variant.getCapacityInBuckets() == null) { return CREATIVE_HELP; } @@ -68,7 +68,7 @@ protected ItemStack createPrimaryDisassemblyByproduct(final int count) { @Override @Nullable protected ItemStack createSecondaryDisassemblyByproduct(final int count) { - if (variant == FluidStorageType.Variant.CREATIVE) { + if (variant == FluidStorageVariant.CREATIVE) { return null; } return new ItemStack(Items.INSTANCE.getFluidStoragePart(variant), count); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlock.java index a148f9097..91197ada2 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlock.java @@ -2,7 +2,7 @@ import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; import net.minecraft.core.BlockPos; @@ -10,9 +10,9 @@ import net.minecraft.world.level.block.state.BlockState; public class ItemStorageBlock extends AbstractStorageBlock { - private final ItemStorageType.Variant variant; + private final ItemStorageVariant variant; - public ItemStorageBlock(final ItemStorageType.Variant variant) { + public ItemStorageBlock(final ItemStorageVariant variant) { super( BlockConstants.PROPERTIES, new NetworkNodeBlockEntityTicker<>(() -> BlockEntities.INSTANCE.getItemStorageBlock(variant)) diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockBlockEntity.java index a687ebfd7..9268b894c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockBlockEntity.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; import com.refinedmods.refinedstorage.platform.common.Platform; import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; import com.refinedmods.refinedstorage.platform.common.storage.StorageTypes; import net.minecraft.core.BlockPos; @@ -18,12 +18,12 @@ import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class ItemStorageBlockBlockEntity extends AbstractStorageBlockBlockEntity { - private final ItemStorageType.Variant variant; + private final ItemStorageVariant variant; private final Component displayName; public ItemStorageBlockBlockEntity(final BlockPos pos, final BlockState state, - final ItemStorageType.Variant variant) { + final ItemStorageVariant variant) { super( BlockEntities.INSTANCE.getItemStorageBlock(variant), pos, @@ -35,7 +35,7 @@ public ItemStorageBlockBlockEntity(final BlockPos pos, this.displayName = createTranslation("block", String.format("%s_storage_block", variant.getName())); } - private static long getEnergyUsage(final ItemStorageType.Variant variant) { + private static long getEnergyUsage(final ItemStorageVariant variant) { return switch (variant) { case ONE_K -> Platform.INSTANCE.getConfig().getStorageBlock().get1kEnergyUsage(); case FOUR_K -> Platform.INSTANCE.getConfig().getStorageBlock().get4kEnergyUsage(); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockBlockItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockBlockItem.java index 68b1d48ea..c3745101d 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockBlockItem.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockBlockItem.java @@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; import com.refinedmods.refinedstorage.platform.common.content.Blocks; import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; import java.util.Optional; import javax.annotation.Nullable; @@ -25,10 +25,10 @@ public class ItemStorageBlockBlockItem extends AbstractStorageContainerBlockItem { private static final Component CREATIVE_HELP = createTranslation("item", "creative_storage_block.help"); - private final ItemStorageType.Variant variant; + private final ItemStorageVariant variant; private final Component helpText; - public ItemStorageBlockBlockItem(final Block block, final ItemStorageType.Variant variant) { + public ItemStorageBlockBlockItem(final Block block, final ItemStorageVariant variant) { super( block, new Item.Properties().stacksTo(1).fireResistant(), @@ -58,7 +58,7 @@ protected ItemStack createPrimaryDisassemblyByproduct(final int count) { @Override @Nullable protected ItemStack createSecondaryDisassemblyByproduct(final int count) { - if (variant == ItemStorageType.Variant.CREATIVE) { + if (variant == ItemStorageVariant.CREATIVE) { return null; } return new ItemStack(Items.INSTANCE.getItemStoragePart(variant), count); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/FluidStorageDiskItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/FluidStorageDiskItem.java index 7edd66afe..e5d14d944 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/FluidStorageDiskItem.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/FluidStorageDiskItem.java @@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; import com.refinedmods.refinedstorage.platform.common.storage.StorageTypes; import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceRendering; @@ -24,10 +24,10 @@ public class FluidStorageDiskItem extends AbstractStorageContainerItem { private static final Component CREATIVE_HELP = createTranslation("item", "creative_fluid_storage_disk.help"); - private final FluidStorageType.Variant variant; + private final FluidStorageVariant variant; private final Component helpText; - public FluidStorageDiskItem(final FluidStorageType.Variant variant) { + public FluidStorageDiskItem(final FluidStorageVariant variant) { super( new Item.Properties().stacksTo(1).fireResistant(), PlatformApi.INSTANCE.getStorageContainerItemHelper() @@ -36,7 +36,7 @@ public FluidStorageDiskItem(final FluidStorageType.Variant variant) { this.helpText = getHelpText(variant); } - private static Component getHelpText(final FluidStorageType.Variant variant) { + private static Component getHelpText(final FluidStorageVariant variant) { if (variant.getCapacityInBuckets() == null) { return CREATIVE_HELP; } @@ -70,7 +70,7 @@ protected ItemStack createPrimaryDisassemblyByproduct(final int count) { @Override @Nullable protected ItemStack createSecondaryDisassemblyByproduct(final int count) { - if (variant == FluidStorageType.Variant.CREATIVE) { + if (variant == FluidStorageVariant.CREATIVE) { return null; } return new ItemStack(Items.INSTANCE.getFluidStoragePart(variant), count); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/ItemStorageDiskItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/ItemStorageDiskItem.java index e4794bad5..153bafb96 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/ItemStorageDiskItem.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/ItemStorageDiskItem.java @@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; import com.refinedmods.refinedstorage.platform.common.storage.StorageTypes; import java.util.Optional; @@ -23,10 +23,10 @@ public class ItemStorageDiskItem extends AbstractStorageContainerItem { private static final Component CREATIVE_HELP = createTranslation("item", "creative_storage_disk.help"); - private final ItemStorageType.Variant variant; + private final ItemStorageVariant variant; private final Component helpText; - public ItemStorageDiskItem(final ItemStorageType.Variant variant) { + public ItemStorageDiskItem(final ItemStorageVariant variant) { super( new Item.Properties().stacksTo(1).fireResistant(), PlatformApi.INSTANCE.getStorageContainerItemHelper() @@ -60,7 +60,7 @@ protected ItemStack createPrimaryDisassemblyByproduct(final int count) { @Override @Nullable protected ItemStack createSecondaryDisassemblyByproduct(final int count) { - if (variant == ItemStorageType.Variant.CREATIVE) { + if (variant == ItemStorageVariant.CREATIVE) { return null; } return new ItemStack(Items.INSTANCE.getItemStoragePart(variant), count); diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/ItemTagsProviderImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/ItemTagsProviderImpl.java index 18b4f10eb..fe651942a 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/ItemTagsProviderImpl.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/ItemTagsProviderImpl.java @@ -2,8 +2,8 @@ import com.refinedmods.refinedstorage.platform.common.content.Blocks; import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; import java.util.Arrays; @@ -58,8 +58,8 @@ protected void addTags(final HolderLookup.Provider provider) { .map(c -> (Supplier) () -> c) .toList()); addAllToTag(FLUID_STORAGE_DISKS, - Arrays.stream(FluidStorageType.Variant.values()) - .filter(variant -> variant != FluidStorageType.Variant.CREATIVE) + Arrays.stream(FluidStorageVariant.values()) + .filter(variant -> variant != FluidStorageVariant.CREATIVE) .map(Items.INSTANCE::getFluidStorageDisk) .map(t -> (Supplier) () -> t) .toList()); @@ -72,8 +72,8 @@ protected void addTags(final HolderLookup.Provider provider) { .map(block -> (Supplier) block::asItem) .toList()); addAllToTag(STORAGE_DISKS, - Arrays.stream(ItemStorageType.Variant.values()) - .filter(variant -> variant != ItemStorageType.Variant.CREATIVE) + Arrays.stream(ItemStorageVariant.values()) + .filter(variant -> variant != ItemStorageVariant.CREATIVE) .map(Items.INSTANCE::getItemStorageDisk) .map(t -> (Supplier) () -> t) .toList()); diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorTestPlots.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorTestPlots.java index 8bf1cb20a..543e2560a 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorTestPlots.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorTestPlots.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.platform.common.constructordestructor; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -21,10 +21,10 @@ static void preparePlot(final GameTestHelper helper, final Direction direction, final TriConsumer consumer) { helper.setBlock(ZERO.above(), RSBLOCKS.getCreativeController().getDefault()); - helper.setBlock(ZERO.above().above(), RSBLOCKS.getItemStorageBlock(ItemStorageType.Variant.ONE_K)); + helper.setBlock(ZERO.above().above(), RSBLOCKS.getItemStorageBlock(ItemStorageVariant.ONE_K)); helper.setBlock( ZERO.above().above().north(), - RSBLOCKS.getFluidStorageBlock(FluidStorageType.Variant.SIXTY_FOUR_B) + RSBLOCKS.getFluidStorageBlock(FluidStorageVariant.SIXTY_FOUR_B) ); final BlockPos constructorPos = ZERO.above().above().above(); helper.setBlock(constructorPos, RSBLOCKS.getConstructor().getDefault().rotated(direction)); diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorTestPlots.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorTestPlots.java index 9444e559c..286727b45 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorTestPlots.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorTestPlots.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.platform.common.constructordestructor; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -21,10 +21,10 @@ static void preparePlot(final GameTestHelper helper, final Direction direction, final TriConsumer consumer) { helper.setBlock(ZERO.above(), RSBLOCKS.getCreativeController().getDefault()); - helper.setBlock(ZERO.above().above(), RSBLOCKS.getItemStorageBlock(ItemStorageType.Variant.ONE_K)); + helper.setBlock(ZERO.above().above(), RSBLOCKS.getItemStorageBlock(ItemStorageVariant.ONE_K)); helper.setBlock( ZERO.above().above().north(), - RSBLOCKS.getFluidStorageBlock(FluidStorageType.Variant.SIXTY_FOUR_B) + RSBLOCKS.getFluidStorageBlock(FluidStorageVariant.SIXTY_FOUR_B) ); final BlockPos destructorPos = ZERO.above().above().above(); helper.setBlock(destructorPos, RSBLOCKS.getDestructor().getDefault().rotated(direction)); diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTestPlots.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTestPlots.java index 48fea077a..ae62e4ce8 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTestPlots.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTestPlots.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.platform.common.exporter; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -23,10 +23,10 @@ static void preparePlot(final GameTestHelper helper, final Direction direction, final TriConsumer consumer) { helper.setBlock(ZERO.above(), RSBLOCKS.getCreativeController().getDefault()); - helper.setBlock(ZERO.above().above(), RSBLOCKS.getItemStorageBlock(ItemStorageType.Variant.ONE_K)); + helper.setBlock(ZERO.above().above(), RSBLOCKS.getItemStorageBlock(ItemStorageVariant.ONE_K)); helper.setBlock( ZERO.above().above().north(), - RSBLOCKS.getFluidStorageBlock(FluidStorageType.Variant.SIXTY_FOUR_B) + RSBLOCKS.getFluidStorageBlock(FluidStorageVariant.SIXTY_FOUR_B) ); final BlockPos exporterPos = ZERO.above().above().above(); helper.setBlock(exporterPos, RSBLOCKS.getExporter().getDefault().rotated(direction)); diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTestPlots.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTestPlots.java index 54ec0431d..fa19894f5 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTestPlots.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTestPlots.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.platform.common.importer; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -24,10 +24,10 @@ static void preparePlot(final GameTestHelper helper, final Direction direction, final TriConsumer consumer) { helper.setBlock(ZERO.above(), RSBLOCKS.getCreativeController().getDefault()); - helper.setBlock(ZERO.above().above(), RSBLOCKS.getItemStorageBlock(ItemStorageType.Variant.ONE_K)); + helper.setBlock(ZERO.above().above(), RSBLOCKS.getItemStorageBlock(ItemStorageVariant.ONE_K)); helper.setBlock( ZERO.above().above().north(), - RSBLOCKS.getFluidStorageBlock(FluidStorageType.Variant.SIXTY_FOUR_B) + RSBLOCKS.getFluidStorageBlock(FluidStorageVariant.SIXTY_FOUR_B) ); final BlockPos importerPos = ZERO.above().above().above(); helper.setBlock(importerPos, RSBLOCKS.getImporter().getDefault().rotated(direction)); From 8d793d125a9dec3edfc599e051dab4b15461c3c1 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 17 Jul 2024 15:57:18 +0200 Subject: [PATCH 06/36] ci: store refined architect version for gradle in gradle.properties --- gradle.properties | 1 + .../storage/LimitedPlatformStorageTest.java | 29 ------------------- settings.gradle.kts | 18 +++++------- 3 files changed, 9 insertions(+), 39 deletions(-) delete mode 100644 refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/storage/LimitedPlatformStorageTest.java diff --git a/gradle.properties b/gradle.properties index a8d260d7d..97542a91b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,3 @@ +refinedarchitectVersion=0.16.6 # Gradle org.gradle.jvmargs=-Xmx1G diff --git a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/storage/LimitedPlatformStorageTest.java b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/storage/LimitedPlatformStorageTest.java deleted file mode 100644 index a37e37fba..000000000 --- a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/storage/LimitedPlatformStorageTest.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.refinedmods.refinedstorage.platform.common.storage; - -import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorage; -import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import static org.assertj.core.api.Assertions.assertThat; - -class LimitedPlatformStorageTest { - LimitedPlatformStorage sut; - - @BeforeEach - @SuppressWarnings("ConstantConditions") - void setUp() { - final LimitedStorageImpl delegate = new LimitedStorageImpl(new InMemoryStorageImpl(), 100); - sut = new LimitedPlatformStorage(delegate, StorageTypes.ITEM, null, null); - } - - @Test - void testSetup() { - // Assert - assertThat(sut.getType()).isEqualTo(StorageTypes.ITEM); - assertThat(sut).isInstanceOf(LimitedStorage.class); - assertThat(sut.getCapacity()).isEqualTo(100); - } -} diff --git a/settings.gradle.kts b/settings.gradle.kts index a35275d32..4b89d8139 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -10,7 +10,8 @@ dependencyResolutionManagement { } versionCatalogs { create("libs") { - from("com.refinedmods.refinedarchitect:refinedarchitect-versioning:0.16.6") + val refinedarchitectVersion: String by settings + from("com.refinedmods.refinedarchitect:refinedarchitect-versioning:${refinedarchitectVersion}") } } } @@ -30,17 +31,14 @@ pluginManagement { name = "Fabric" url = uri("https://maven.fabricmc.net/") } - maven { - name = "NeoForge" - url = uri("https://maven.neoforged.net/releases") - } } + val refinedarchitectVersion: String by settings plugins { - id("refinedarchitect.root").version("0.16.6") - id("refinedarchitect.base").version("0.16.6") - id("refinedarchitect.common").version("0.16.6") - id("refinedarchitect.neoforge").version("0.16.6") - id("refinedarchitect.fabric").version("0.16.6") + id("refinedarchitect.root").version(refinedarchitectVersion) + id("refinedarchitect.base").version(refinedarchitectVersion) + id("refinedarchitect.common").version(refinedarchitectVersion) + id("refinedarchitect.neoforge").version(refinedarchitectVersion) + id("refinedarchitect.fabric").version(refinedarchitectVersion) } } From d961e5fabafa526bfe71bcbb339b141b7a00992e Mon Sep 17 00:00:00 2001 From: Starforcraft Date: Fri, 12 Jul 2024 09:30:43 +0200 Subject: [PATCH 07/36] feat: stack upgrade gametest setup --- .../platform/common/GameTestUtil.java | 98 +++++- .../ConstructorTest.java | 49 ++- .../constructordestructor/DestructorTest.java | 136 ++++----- .../common/exporter/ExporterTest.java | 152 +++++++--- .../common/exporter/ExporterTestPlots.java | 6 +- .../common/importer/ImporterTest.java | 278 +++++++++++++----- .../common/importer/ImporterTestPlots.java | 15 + 7 files changed, 547 insertions(+), 187 deletions(-) diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/GameTestUtil.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/GameTestUtil.java index c2d0b5fea..249734897 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/GameTestUtil.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/GameTestUtil.java @@ -8,11 +8,15 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.EmptyActor; import com.refinedmods.refinedstorage.platform.api.support.network.AbstractNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.common.iface.InterfaceBlockEntity; import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import java.util.Arrays; +import java.util.Iterator; import java.util.function.Consumer; import java.util.stream.IntStream; import javax.annotation.Nullable; @@ -20,16 +24,21 @@ import net.minecraft.core.BlockPos; import net.minecraft.gametest.framework.GameTestAssertException; import net.minecraft.gametest.framework.GameTestHelper; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; import net.minecraft.world.level.block.entity.BaseContainerBlockEntity; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.FluidState; +import net.minecraft.world.phys.AABB; public final class GameTestUtil { public static final Blocks RSBLOCKS = Blocks.INSTANCE; + public static final Items RSITEMS = Items.INSTANCE; private GameTestUtil() { } @@ -106,29 +115,110 @@ public static void assertFluidPresent(final GameTestHelper helper, ); } + public static void assertItemEntityPresentExactly(final GameTestHelper helper, + final ItemStack itemStack, + final BlockPos pos, + final double expansionAmount) { + final BlockPos blockpos = helper.absolutePos(pos); + final Iterator entityIterator = helper.getLevel().getEntities(EntityType.ITEM, + (new AABB(blockpos)).inflate(expansionAmount), Entity::isAlive).iterator(); + + ItemEntity itemEntity; + do { + if (!entityIterator.hasNext()) { + throw new GameTestAssertException("Expected " + itemStack.getItem().getDescription().getString() + + " item at: " + blockpos + " with count: " + itemStack.getCount()); + } + + itemEntity = entityIterator.next(); + } while (!itemEntity.getItem().getItem().equals(itemStack.getItem()) + || itemEntity.getItem().getCount() != itemStack.getCount()); + } + + public static Runnable assertInterfaceEmpty(final GameTestHelper helper, + final BlockPos pos) { + final var interfaceBlockEntity = requireBlockEntity(helper, pos, InterfaceBlockEntity.class); + + return assertResourceContainerEmpty(interfaceBlockEntity.getDisplayName(), + interfaceBlockEntity.getExportedResources()); + } + + private static Runnable assertResourceContainerEmpty(final Component displayName, + final ResourceContainer container) { + return () -> { + for (int i = 0; i < container.size(); i++) { + if (!container.isEmpty(i)) { + throw new GameTestAssertException(displayName.getString() + " should be empty"); + } + } + }; + } + + public static Runnable interfaceContainsExactly(final GameTestHelper helper, + final BlockPos pos, + final ResourceAmount... expected) { + final var interfaceBlockEntity = requireBlockEntity(helper, pos, InterfaceBlockEntity.class); + + return resourceContainerContainsExactly(helper, interfaceBlockEntity.getDisplayName(), + interfaceBlockEntity.getExportedResources(), expected); + } + + private static Runnable resourceContainerContainsExactly(final GameTestHelper helper, + final Component displayName, + final ResourceContainer container, + final ResourceAmount... expected) { + return () -> { + // TODO: This does not take duplicate ResourceAmount into account + for (final ResourceAmount expectedStack : expected) { + final boolean contains = IntStream.range(0, container.size()) + .mapToObj(container::get) + .anyMatch(resource -> resource != null + && resource.getResource().equals(expectedStack.getResource()) + && resource.getAmount() == expectedStack.getAmount()); + + helper.assertTrue(contains, "Expected resource is missing from " + displayName.getString() + ": " + + expectedStack + " with count: " + expectedStack.getAmount()); + } + + for (int i = 0; i < container.size(); i++) { + final ResourceAmount resource = container.get(i); + if (resource != null) { + final boolean wasExpected = Arrays.stream(expected).anyMatch( + expectedResource -> expectedResource.getResource().equals(resource.getResource()) + && expectedResource.getAmount() == resource.getAmount() + ); + + helper.assertTrue(wasExpected, "Unexpected resource found in " + displayName.getString() + ": " + + resource.getResource() + " with count: " + resource.getAmount()); + } + } + }; + } + public static Runnable containerContainsExactly(final GameTestHelper helper, final BlockPos pos, final ResourceAmount... expected) { final var containerBlockEntity = requireBlockEntity(helper, pos, BaseContainerBlockEntity.class); return () -> { + // TODO: This does not take duplicate ResourceAmount into account for (final ResourceAmount expectedStack : expected) { final boolean contains = IntStream.range(0, containerBlockEntity.getContainerSize()) .mapToObj(containerBlockEntity::getItem) .anyMatch(inContainer -> asResource(inContainer).equals(expectedStack.getResource()) && inContainer.getCount() == expectedStack.getAmount()); - helper.assertTrue(contains, "Expected resource is missing from storage: " + helper.assertTrue(contains, "Expected resource is missing from container: " + expectedStack + " with count: " + expectedStack.getAmount()); } for (int i = 0; i < containerBlockEntity.getContainerSize(); i++) { final ItemStack inContainer = containerBlockEntity.getItem(i); - if (inContainer.getItem() != Items.AIR) { + if (!inContainer.isEmpty()) { final boolean wasExpected = Arrays.stream(expected).anyMatch( expectedStack -> expectedStack.getResource().equals(asResource(inContainer)) && expectedStack.getAmount() == inContainer.getCount() ); - helper.assertTrue(wasExpected, "Unexpected resource found in storage: " + helper.assertTrue(wasExpected, "Unexpected resource found in container: " + inContainer.getDescriptionId() + " with count: " + inContainer.getCount()); } } diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorTest.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorTest.java index 505551875..9221aa1c5 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorTest.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorTest.java @@ -15,8 +15,10 @@ import net.neoforged.neoforge.gametest.GameTestHolder; import net.neoforged.neoforge.gametest.PrefixGameTestTemplate; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.RSITEMS; import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.asResource; import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.assertFluidPresent; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.assertItemEntityPresentExactly; import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.insert; import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.networkIsAvailable; import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.storageContainsExactly; @@ -100,7 +102,12 @@ public static void shouldDropItem(final GameTestHelper helper) { // Assert sequence .thenWaitUntil(() -> helper.assertBlockNotPresent(Blocks.DIRT, pos.east())) - .thenWaitUntil(() -> helper.assertItemEntityPresent(DIRT, pos.east(), 1)) + .thenWaitUntil(() -> assertItemEntityPresentExactly( + helper, + DIRT.getDefaultInstance().copyWithCount(1), + pos.east(), + 1 + )) .thenWaitUntil(storageContainsExactly( helper, pos, @@ -111,6 +118,46 @@ public static void shouldDropItem(final GameTestHelper helper) { }); } + @GameTest(template = "empty_15x15") + public static void shouldDropItemWithStackUpgrade(final GameTestHelper helper) { + preparePlot(helper, Direction.EAST, (constructor, pos, sequence) -> { + // Arrange + sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { + insert(helper, network, DIRT, 65); + insert(helper, network, STONE, 15); + })); + + // Act + constructor.setDropItems(true); + constructor.setFilters(List.of(asResource(DIRT))); + constructor.addUpgradeItem(RSITEMS.getStackUpgrade()); + + // Assert + sequence + .thenIdle(9) + .thenExecute(() -> helper.assertBlockNotPresent(Blocks.DIRT, pos.east())) + .thenExecute(() -> assertItemEntityPresentExactly( + helper, + DIRT.getDefaultInstance().copyWithCount(64), + pos.east(), + 1 + )) + .thenExecute(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 1), + new ResourceAmount(asResource(STONE), 15) + )) + .thenIdle(9) + .thenExecute(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(STONE), 15) + )) + .thenSucceed(); + }); + } + @GameTest(template = "empty_15x15") public static void shouldPlaceFireworks(final GameTestHelper helper) { preparePlot(helper, Direction.EAST, (constructor, pos, sequence) -> { diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorTest.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorTest.java index c6207d66e..f6ae954c5 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorTest.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorTest.java @@ -72,17 +72,17 @@ public static void shouldBreakBlockAllowlist(final GameTestHelper helper) { // Assert sequence - .thenWaitUntil(() -> helper.assertBlockNotPresent(Blocks.DIRT, pos.east())) - .thenExecute(() -> helper.setBlock(pos.east(), Blocks.STONE)) - .thenIdle(20) - .thenWaitUntil(() -> helper.assertBlockPresent(Blocks.STONE, pos.east())) - .thenWaitUntil(storageContainsExactly( - helper, - pos, - new ResourceAmount(asResource(DIRT), 11), - new ResourceAmount(asResource(STONE), 15) - )) - .thenSucceed(); + .thenWaitUntil(() -> helper.assertBlockNotPresent(Blocks.DIRT, pos.east())) + .thenExecute(() -> helper.setBlock(pos.east(), Blocks.STONE)) + .thenIdle(20) + .thenWaitUntil(() -> helper.assertBlockPresent(Blocks.STONE, pos.east())) + .thenWaitUntil(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 11), + new ResourceAmount(asResource(STONE), 15) + )) + .thenSucceed(); }); } @@ -103,17 +103,17 @@ public static void shouldBreakBlockBlocklist(final GameTestHelper helper) { // Assert sequence - .thenWaitUntil(() -> helper.assertBlockNotPresent(Blocks.DIRT, pos.east())) - .thenExecute(() -> helper.setBlock(pos.east(), Blocks.STONE)) - .thenIdle(20) - .thenWaitUntil(() -> helper.assertBlockPresent(Blocks.STONE, pos.east())) - .thenWaitUntil(storageContainsExactly( - helper, - pos, - new ResourceAmount(asResource(DIRT), 11), - new ResourceAmount(asResource(STONE), 15) - )) - .thenSucceed(); + .thenWaitUntil(() -> helper.assertBlockNotPresent(Blocks.DIRT, pos.east())) + .thenExecute(() -> helper.setBlock(pos.east(), Blocks.STONE)) + .thenIdle(20) + .thenWaitUntil(() -> helper.assertBlockPresent(Blocks.STONE, pos.east())) + .thenWaitUntil(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 11), + new ResourceAmount(asResource(STONE), 15) + )) + .thenSucceed(); }); } @@ -135,17 +135,17 @@ public static void shouldPickupItemAllowlist(final GameTestHelper helper) { // Assert sequence - .thenWaitUntil(() -> helper.assertItemEntityNotPresent(DIRT, pos.east(), 1)) - .thenExecute(() -> helper.spawnItem(STONE, pos.east())) - .thenIdle(20) - .thenWaitUntil(() -> helper.assertItemEntityPresent(STONE, pos.east(), 1)) - .thenWaitUntil(storageContainsExactly( - helper, - pos, - new ResourceAmount(asResource(DIRT), 11), - new ResourceAmount(asResource(STONE), 15) - )) - .thenSucceed(); + .thenWaitUntil(() -> helper.assertItemEntityNotPresent(DIRT, pos.east(), 1)) + .thenExecute(() -> helper.spawnItem(STONE, pos.east())) + .thenIdle(20) + .thenWaitUntil(() -> helper.assertItemEntityPresent(STONE, pos.east(), 1)) + .thenWaitUntil(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 11), + new ResourceAmount(asResource(STONE), 15) + )) + .thenSucceed(); }); } @@ -167,17 +167,17 @@ public static void shouldPickupItemBlocklist(final GameTestHelper helper) { // Assert sequence - .thenWaitUntil(() -> helper.assertItemEntityNotPresent(DIRT, pos.east(), 1)) - .thenExecute(() -> helper.spawnItem(STONE, pos.east())) - .thenIdle(20) - .thenWaitUntil(() -> helper.assertItemEntityPresent(STONE, pos.east(), 1)) - .thenWaitUntil(storageContainsExactly( - helper, - pos, - new ResourceAmount(asResource(DIRT), 11), - new ResourceAmount(asResource(STONE), 15) - )) - .thenSucceed(); + .thenWaitUntil(() -> helper.assertItemEntityNotPresent(DIRT, pos.east(), 1)) + .thenExecute(() -> helper.spawnItem(STONE, pos.east())) + .thenIdle(20) + .thenWaitUntil(() -> helper.assertItemEntityPresent(STONE, pos.east(), 1)) + .thenWaitUntil(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 11), + new ResourceAmount(asResource(STONE), 15) + )) + .thenSucceed(); }); } @@ -198,18 +198,18 @@ public static void shouldDrainFluidAllowlist(final GameTestHelper helper) { // Assert sequence - .thenWaitUntil(() -> helper.assertBlockNotPresent(Blocks.WATER, pos.east())) - .thenExecute(() -> helper.setBlock(pos.east(), Blocks.DIRT)) - .thenIdle(20) - .thenWaitUntil(() -> helper.assertBlockPresent(Blocks.DIRT, pos.east())) - .thenWaitUntil(storageContainsExactly( - helper, - pos, - new ResourceAmount(asResource(DIRT), 10), - new ResourceAmount(asResource(STONE), 15), - new ResourceAmount(asResource(WATER), Platform.INSTANCE.getBucketAmount()) - )) - .thenSucceed(); + .thenWaitUntil(() -> helper.assertBlockNotPresent(Blocks.WATER, pos.east())) + .thenExecute(() -> helper.setBlock(pos.east(), Blocks.DIRT)) + .thenIdle(20) + .thenWaitUntil(() -> helper.assertBlockPresent(Blocks.DIRT, pos.east())) + .thenWaitUntil(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 10), + new ResourceAmount(asResource(STONE), 15), + new ResourceAmount(asResource(WATER), Platform.INSTANCE.getBucketAmount()) + )) + .thenSucceed(); }); } @@ -230,18 +230,18 @@ public static void shouldDrainFluidBlocklist(final GameTestHelper helper) { // Assert sequence - .thenWaitUntil(() -> helper.assertBlockNotPresent(Blocks.WATER, pos.east())) - .thenExecute(() -> helper.setBlock(pos.east(), Blocks.LAVA)) - .thenIdle(20) - .thenWaitUntil(() -> helper.assertBlockPresent(Blocks.LAVA, pos.east())) - .thenWaitUntil(storageContainsExactly( - helper, - pos, - new ResourceAmount(asResource(DIRT), 10), - new ResourceAmount(asResource(STONE), 15), - new ResourceAmount(asResource(WATER), Platform.INSTANCE.getBucketAmount()) - )) - .thenSucceed(); + .thenWaitUntil(() -> helper.assertBlockNotPresent(Blocks.WATER, pos.east())) + .thenExecute(() -> helper.setBlock(pos.east(), Blocks.LAVA)) + .thenIdle(20) + .thenWaitUntil(() -> helper.assertBlockPresent(Blocks.LAVA, pos.east())) + .thenWaitUntil(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 10), + new ResourceAmount(asResource(STONE), 15), + new ResourceAmount(asResource(WATER), Platform.INSTANCE.getBucketAmount()) + )) + .thenSucceed(); }); } } diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTest.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTest.java index dd4e4809f..4bcc08ee4 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTest.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTest.java @@ -10,13 +10,17 @@ import net.minecraft.gametest.framework.GameTest; import net.minecraft.gametest.framework.GameTestHelper; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.LayeredCauldronBlock; import net.neoforged.neoforge.gametest.GameTestHolder; import net.neoforged.neoforge.gametest.PrefixGameTestTemplate; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.RSBLOCKS; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.RSITEMS; import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.asResource; import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.containerContainsExactly; import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.insert; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.interfaceContainsExactly; import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.networkIsAvailable; import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.storageContainsExactly; import static com.refinedmods.refinedstorage.platform.common.exporter.ExporterTestPlots.preparePlot; @@ -33,7 +37,7 @@ private ExporterTest() { @GameTest(template = "empty_15x15") public static void shouldExportItem(final GameTestHelper helper) { - preparePlot(helper, true, Direction.EAST, (exporter, pos, sequence) -> { + preparePlot(helper, Blocks.CHEST, Direction.EAST, (exporter, pos, sequence) -> { // Arrange final ItemStack damagedDiamondChestplate = DIAMOND_CHESTPLATE.getDefaultInstance(); damagedDiamondChestplate.setDamageValue(500); @@ -50,15 +54,60 @@ public static void shouldExportItem(final GameTestHelper helper) { // Assert sequence .thenWaitUntil(containerContainsExactly( - helper, - pos.east(), - new ResourceAmount(asResource(DIRT), 1))) + helper, + pos.east(), + new ResourceAmount(asResource(DIRT), 1) + )) .thenWaitUntil(storageContainsExactly( - helper, - pos, - new ResourceAmount(asResource(DIRT), 9), - new ResourceAmount(asResource(STONE), 15), - new ResourceAmount(asResource(damagedDiamondChestplate), 1) + helper, + pos, + new ResourceAmount(asResource(DIRT), 9), + new ResourceAmount(asResource(STONE), 15), + new ResourceAmount(asResource(damagedDiamondChestplate), 1) + )) + .thenSucceed(); + }); + } + + @GameTest(template = "empty_15x15") + public static void shouldExportItemWithStackUpgrade(final GameTestHelper helper) { + preparePlot(helper, Blocks.CHEST, Direction.EAST, (exporter, pos, sequence) -> { + // Arrange + sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { + insert(helper, network, DIRT, 65); + insert(helper, network, STONE, 1); + })); + + // Act + exporter.setFilters(List.of(asResource(DIRT))); + exporter.addUpgradeItem(RSITEMS.getStackUpgrade()); + + // Assert + sequence + .thenIdle(9) + .thenExecute(containerContainsExactly( + helper, + pos.east(), + new ResourceAmount(asResource(DIRT), 64) + )) + .thenExecute(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 1), + new ResourceAmount(asResource(STONE), 1) + )) + .thenExecute(() -> exporter.setFilters(List.of(asResource(STONE)))) + .thenIdle(9) + .thenExecute(containerContainsExactly( + helper, + pos.east(), + new ResourceAmount(asResource(DIRT), 64), + new ResourceAmount(asResource(STONE), 1) + )) + .thenExecute(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 1) )) .thenSucceed(); }); @@ -66,7 +115,7 @@ public static void shouldExportItem(final GameTestHelper helper) { @GameTest(template = "empty_15x15") public static void shouldExportItemFuzzy(final GameTestHelper helper) { - preparePlot(helper, true, Direction.EAST, (exporter, pos, sequence) -> { + preparePlot(helper, Blocks.CHEST, Direction.EAST, (exporter, pos, sequence) -> { // Arrange final ItemStack damagedDiamondChestplate = DIAMOND_CHESTPLATE.getDefaultInstance(); damagedDiamondChestplate.setDamageValue(500); @@ -84,24 +133,25 @@ public static void shouldExportItemFuzzy(final GameTestHelper helper) { // Assert sequence - .thenWaitUntil(containerContainsExactly( - helper, - pos.east(), - new ResourceAmount(asResource(DIAMOND_CHESTPLATE.getDefaultInstance()), 1), - new ResourceAmount(asResource(damagedDiamondChestplate), 1))) - .thenWaitUntil(storageContainsExactly( - helper, - pos, - new ResourceAmount(asResource(DIRT), 10), - new ResourceAmount(asResource(STONE), 15) - )) - .thenSucceed(); + .thenWaitUntil(containerContainsExactly( + helper, + pos.east(), + new ResourceAmount(asResource(DIAMOND_CHESTPLATE.getDefaultInstance()), 1), + new ResourceAmount(asResource(damagedDiamondChestplate), 1) + )) + .thenWaitUntil(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 10), + new ResourceAmount(asResource(STONE), 15) + )) + .thenSucceed(); }); } @GameTest(template = "empty_15x15") public static void shouldExportFluid(final GameTestHelper helper) { - preparePlot(helper, false, Direction.EAST, (exporter, pos, sequence) -> { + preparePlot(helper, Blocks.CAULDRON, Direction.EAST, (exporter, pos, sequence) -> { // Arrange sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { insert(helper, network, DIRT, 10); @@ -114,16 +164,52 @@ public static void shouldExportFluid(final GameTestHelper helper) { // Assert sequence - .thenWaitUntil(() -> helper.assertBlockProperty(pos.east(), LayeredCauldronBlock.LEVEL, - LayeredCauldronBlock.MAX_FILL_LEVEL)) - .thenWaitUntil(storageContainsExactly( - helper, - pos, - new ResourceAmount(asResource(DIRT), 10), - new ResourceAmount(asResource(STONE), 15), - new ResourceAmount(asResource(WATER), Platform.INSTANCE.getBucketAmount()) - )) - .thenSucceed(); + .thenWaitUntil(() -> helper.assertBlockProperty(pos.east(), LayeredCauldronBlock.LEVEL, + LayeredCauldronBlock.MAX_FILL_LEVEL)) + .thenWaitUntil(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 10), + new ResourceAmount(asResource(STONE), 15), + new ResourceAmount(asResource(WATER), Platform.INSTANCE.getBucketAmount()) + )) + .thenSucceed(); + }); + } + + @GameTest(template = "empty_15x15") + public static void shouldExportFluidWithStackUpgrade(final GameTestHelper helper) { + preparePlot(helper, RSBLOCKS.getInterface(), Direction.EAST, (exporter, pos, sequence) -> { + // Arrange + sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { + insert(helper, network, DIRT, 10); + insert(helper, network, STONE, 15); + insert(helper, network, WATER, Platform.INSTANCE.getBucketAmount() * 64); + })); + + // Act + exporter.addUpgradeItem(RSITEMS.getStackUpgrade()); + exporter.setFilters(List.of(asResource(WATER))); + + // Assert + sequence + .thenIdle(9) + .thenExecute(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 10), + new ResourceAmount(asResource(STONE), 15) + )) + .thenExecute(interfaceContainsExactly( + helper, + pos.east(), + new ResourceAmount(asResource(WATER), Platform.INSTANCE.getBucketAmount() * 16), + new ResourceAmount(asResource(WATER), Platform.INSTANCE.getBucketAmount() * 16), + new ResourceAmount(asResource(WATER), Platform.INSTANCE.getBucketAmount() * 16), + new ResourceAmount(asResource(WATER), Platform.INSTANCE.getBucketAmount() * 16) + )) + + .thenSucceed(); }); } } diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTestPlots.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTestPlots.java index ae62e4ce8..9eefb3773 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTestPlots.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTestPlots.java @@ -7,7 +7,7 @@ import net.minecraft.core.Direction; import net.minecraft.gametest.framework.GameTestHelper; import net.minecraft.gametest.framework.GameTestSequence; -import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.Block; import org.apache.commons.lang3.function.TriConsumer; import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.RSBLOCKS; @@ -19,7 +19,7 @@ private ExporterTestPlots() { } static void preparePlot(final GameTestHelper helper, - final boolean itemTest, + final Block block, final Direction direction, final TriConsumer consumer) { helper.setBlock(ZERO.above(), RSBLOCKS.getCreativeController().getDefault()); @@ -30,7 +30,7 @@ static void preparePlot(final GameTestHelper helper, ); final BlockPos exporterPos = ZERO.above().above().above(); helper.setBlock(exporterPos, RSBLOCKS.getExporter().getDefault().rotated(direction)); - helper.setBlock(exporterPos.east(), itemTest ? Blocks.CHEST : Blocks.CAULDRON); + helper.setBlock(exporterPos.east(), block); consumer.accept( requireBlockEntity(helper, exporterPos, ExporterBlockEntity.class), exporterPos, diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTest.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTest.java index f2650ec82..1cfe5ebd8 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTest.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTest.java @@ -16,17 +16,22 @@ import net.neoforged.neoforge.gametest.GameTestHolder; import net.neoforged.neoforge.gametest.PrefixGameTestTemplate; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.RSITEMS; import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.asResource; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.assertInterfaceEmpty; import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.containerContainsExactly; import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.insert; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.interfaceContainsExactly; import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.networkIsAvailable; import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.storageContainsExactly; import static com.refinedmods.refinedstorage.platform.common.importer.ImporterTestPlots.prepareChest; +import static com.refinedmods.refinedstorage.platform.common.importer.ImporterTestPlots.prepareInterface; import static com.refinedmods.refinedstorage.platform.common.importer.ImporterTestPlots.preparePlot; import static net.minecraft.world.item.Items.COBBLESTONE; import static net.minecraft.world.item.Items.DIAMOND_CHESTPLATE; import static net.minecraft.world.item.Items.DIRT; import static net.minecraft.world.item.Items.STONE; +import static net.minecraft.world.level.material.Fluids.LAVA; import static net.minecraft.world.level.material.Fluids.WATER; @GameTestHolder(IdentifierUtil.MOD_ID) @@ -45,20 +50,69 @@ public static void shouldImportItem(final GameTestHelper helper) { })); // Act - prepareChest(helper, pos.east(), DIRT.getDefaultInstance(), - COBBLESTONE.getDefaultInstance().copyWithCount(3)); + prepareChest( + helper, + pos.east(), + DIRT.getDefaultInstance(), + COBBLESTONE.getDefaultInstance().copyWithCount(3) + ); // Assert sequence - .thenWaitUntil(() -> helper.assertContainerEmpty(pos.east())) - .thenWaitUntil(storageContainsExactly( - helper, - pos, - new ResourceAmount(asResource(DIRT), 11), - new ResourceAmount(asResource(STONE), 15), - new ResourceAmount(asResource(COBBLESTONE), 3) - )) - .thenSucceed(); + .thenWaitUntil(() -> helper.assertContainerEmpty(pos.east())) + .thenWaitUntil(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 11), + new ResourceAmount(asResource(STONE), 15), + new ResourceAmount(asResource(COBBLESTONE), 3) + )) + .thenSucceed(); + }); + } + + @GameTest(template = "empty_15x15") + public static void shouldImportItemWithStackUpgrade(final GameTestHelper helper) { + preparePlot(helper, Direction.EAST, (importer, pos, sequence) -> { + // Arrange + sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { + insert(helper, network, DIRT, 10); + insert(helper, network, STONE, 15); + })); + + // Act + prepareChest( + helper, + pos.east(), + COBBLESTONE.getDefaultInstance().copyWithCount(64), + DIRT.getDefaultInstance() + ); + importer.addUpgradeItem(RSITEMS.getStackUpgrade()); + + // Assert + sequence + .thenExecute(() -> containerContainsExactly( + helper, + pos.east(), + new ResourceAmount(asResource(DIRT), 1) + )) + .thenExecute(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 10), + new ResourceAmount(asResource(STONE), 15), + new ResourceAmount(asResource(COBBLESTONE), 64) + )) + .thenIdle(9) + .thenExecute(() -> helper.assertContainerEmpty(pos.east())) + .thenExecute(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 11), + new ResourceAmount(asResource(STONE), 15), + new ResourceAmount(asResource(COBBLESTONE), 64) + )) + .thenSucceed(); }); } @@ -74,8 +128,12 @@ public static void shouldImportItemBlocklist(final GameTestHelper helper) { // Act final ItemStack damagedDiamondChestplate = DIAMOND_CHESTPLATE.getDefaultInstance(); damagedDiamondChestplate.setDamageValue(500); - prepareChest(helper, pos.east(), DIRT.getDefaultInstance(), - DIAMOND_CHESTPLATE.getDefaultInstance(), damagedDiamondChestplate); + prepareChest( + helper, + pos.east(), + DIRT.getDefaultInstance(), + DIAMOND_CHESTPLATE.getDefaultInstance(), damagedDiamondChestplate + ); importer.setFuzzyMode(false); importer.setFilters(Set.of(asResource(DIAMOND_CHESTPLATE.getDefaultInstance()))); @@ -83,18 +141,19 @@ public static void shouldImportItemBlocklist(final GameTestHelper helper) { // Assert sequence - .thenWaitUntil(containerContainsExactly( - helper, - pos.east(), - new ResourceAmount(asResource(DIAMOND_CHESTPLATE.getDefaultInstance()), 1))) - .thenWaitUntil(storageContainsExactly( - helper, - pos, - new ResourceAmount(asResource(DIRT), 11), - new ResourceAmount(asResource(STONE), 15), - new ResourceAmount(asResource(damagedDiamondChestplate), 1) - )) - .thenSucceed(); + .thenWaitUntil(containerContainsExactly( + helper, + pos.east(), + new ResourceAmount(asResource(DIAMOND_CHESTPLATE.getDefaultInstance()), 1) + )) + .thenWaitUntil(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 11), + new ResourceAmount(asResource(STONE), 15), + new ResourceAmount(asResource(damagedDiamondChestplate), 1) + )) + .thenSucceed(); }); } @@ -110,8 +169,12 @@ public static void shouldImportItemFuzzyBlocklist(final GameTestHelper helper) { // Act final ItemStack damagedDiamondChestplate = DIAMOND_CHESTPLATE.getDefaultInstance(); damagedDiamondChestplate.setDamageValue(500); - prepareChest(helper, pos.east(), DIRT.getDefaultInstance(), - DIAMOND_CHESTPLATE.getDefaultInstance(), damagedDiamondChestplate); + prepareChest( + helper, + pos.east(), + DIRT.getDefaultInstance(), + DIAMOND_CHESTPLATE.getDefaultInstance(), damagedDiamondChestplate + ); importer.setFuzzyMode(true); importer.setFilters(Set.of(asResource(DIAMOND_CHESTPLATE.getDefaultInstance()))); @@ -119,19 +182,20 @@ public static void shouldImportItemFuzzyBlocklist(final GameTestHelper helper) { // Assert sequence - .thenIdle(10) - .thenWaitUntil(containerContainsExactly( - helper, - pos.east(), - new ResourceAmount(asResource(DIAMOND_CHESTPLATE.getDefaultInstance()), 1), - new ResourceAmount(asResource(damagedDiamondChestplate), 1))) - .thenWaitUntil(storageContainsExactly( - helper, - pos, - new ResourceAmount(asResource(DIRT), 11), - new ResourceAmount(asResource(STONE), 15) - )) - .thenSucceed(); + .thenIdle(9) + .thenWaitUntil(containerContainsExactly( + helper, + pos.east(), + new ResourceAmount(asResource(DIAMOND_CHESTPLATE.getDefaultInstance()), 1), + new ResourceAmount(asResource(damagedDiamondChestplate), 1) + )) + .thenWaitUntil(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 11), + new ResourceAmount(asResource(STONE), 15) + )) + .thenSucceed(); }); } @@ -147,8 +211,12 @@ public static void shouldImportItemAllowlist(final GameTestHelper helper) { // Act final ItemStack damagedDiamondChestplate = DIAMOND_CHESTPLATE.getDefaultInstance(); damagedDiamondChestplate.setDamageValue(500); - prepareChest(helper, pos.east(), DIRT.getDefaultInstance(), - DIAMOND_CHESTPLATE.getDefaultInstance(), damagedDiamondChestplate); + prepareChest( + helper, + pos.east(), + DIRT.getDefaultInstance(), + DIAMOND_CHESTPLATE.getDefaultInstance(), damagedDiamondChestplate + ); importer.setFuzzyMode(false); importer.setFilters(Set.of(asResource(DIAMOND_CHESTPLATE.getDefaultInstance()))); @@ -156,20 +224,21 @@ public static void shouldImportItemAllowlist(final GameTestHelper helper) { // Assert sequence - .thenWaitUntil(() -> helper.assertContainerContains(pos.east(), DIRT)) - .thenWaitUntil(containerContainsExactly( - helper, - pos.east(), - new ResourceAmount(asResource(DIRT), 1), - new ResourceAmount(asResource(damagedDiamondChestplate), 1))) - .thenWaitUntil(storageContainsExactly( - helper, - pos, - new ResourceAmount(asResource(DIRT), 10), - new ResourceAmount(asResource(STONE), 15), - new ResourceAmount(asResource(DIAMOND_CHESTPLATE.getDefaultInstance()), 1) - )) - .thenSucceed(); + .thenWaitUntil(() -> helper.assertContainerContains(pos.east(), DIRT)) + .thenWaitUntil(containerContainsExactly( + helper, + pos.east(), + new ResourceAmount(asResource(DIRT), 1), + new ResourceAmount(asResource(damagedDiamondChestplate), 1) + )) + .thenWaitUntil(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 10), + new ResourceAmount(asResource(STONE), 15), + new ResourceAmount(asResource(DIAMOND_CHESTPLATE.getDefaultInstance()), 1) + )) + .thenSucceed(); }); } @@ -185,8 +254,12 @@ public static void shouldImportItemFuzzyAllowlist(final GameTestHelper helper) { // Act final ItemStack damagedDiamondChestplate = DIAMOND_CHESTPLATE.getDefaultInstance(); damagedDiamondChestplate.setDamageValue(500); - prepareChest(helper, pos.east(), DIRT.getDefaultInstance(), - DIAMOND_CHESTPLATE.getDefaultInstance(), damagedDiamondChestplate); + prepareChest( + helper, + pos.east(), + DIRT.getDefaultInstance(), + DIAMOND_CHESTPLATE.getDefaultInstance(), damagedDiamondChestplate + ); importer.setFuzzyMode(true); importer.setFilters(Set.of(asResource(DIAMOND_CHESTPLATE.getDefaultInstance()))); @@ -194,16 +267,16 @@ public static void shouldImportItemFuzzyAllowlist(final GameTestHelper helper) { // Assert sequence - .thenWaitUntil(() -> helper.assertContainerContains(pos.east(), DIRT)) - .thenWaitUntil(storageContainsExactly( - helper, - pos, - new ResourceAmount(asResource(DIRT), 10), - new ResourceAmount(asResource(STONE), 15), - new ResourceAmount(asResource(DIAMOND_CHESTPLATE.getDefaultInstance()), 1), - new ResourceAmount(asResource(damagedDiamondChestplate), 1) - )) - .thenSucceed(); + .thenWaitUntil(() -> helper.assertContainerContains(pos.east(), DIRT)) + .thenWaitUntil(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 10), + new ResourceAmount(asResource(STONE), 15), + new ResourceAmount(asResource(DIAMOND_CHESTPLATE.getDefaultInstance()), 1), + new ResourceAmount(asResource(damagedDiamondChestplate), 1) + )) + .thenSucceed(); }); } @@ -218,19 +291,68 @@ public static void shouldImportFluid(final GameTestHelper helper) { // Act helper.setBlock(pos.east(), Blocks.WATER_CAULDRON.defaultBlockState() - .setValue(LayeredCauldronBlock.LEVEL, LayeredCauldronBlock.MAX_FILL_LEVEL)); + .setValue(LayeredCauldronBlock.LEVEL, LayeredCauldronBlock.MAX_FILL_LEVEL)); + + // Assert + sequence + .thenWaitUntil(() -> helper.assertBlockPresent(Blocks.CAULDRON, pos.east())) + .thenWaitUntil(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 10), + new ResourceAmount(asResource(STONE), 15), + new ResourceAmount(asResource(WATER), Platform.INSTANCE.getBucketAmount()) + )) + .thenSucceed(); + }); + } + + @GameTest(template = "empty_15x15") + public static void shouldImportFluidWithStackUpgrade(final GameTestHelper helper) { + preparePlot(helper, Direction.EAST, (importer, pos, sequence) -> { + // Arrange + sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { + insert(helper, network, DIRT, 10); + insert(helper, network, STONE, 15); + })); + + // Act + prepareInterface( + helper, + pos.east(), + new ResourceAmount(asResource(WATER), Platform.INSTANCE.getBucketAmount() * 16), + new ResourceAmount(asResource(WATER), Platform.INSTANCE.getBucketAmount() * 16), + new ResourceAmount(asResource(WATER), Platform.INSTANCE.getBucketAmount() * 16), + new ResourceAmount(asResource(WATER), Platform.INSTANCE.getBucketAmount() * 15), + new ResourceAmount(asResource(LAVA), Platform.INSTANCE.getBucketAmount()) + ); + importer.addUpgradeItem(RSITEMS.getStackUpgrade()); // Assert sequence - .thenWaitUntil(() -> helper.assertBlockPresent(Blocks.CAULDRON, pos.east())) - .thenWaitUntil(storageContainsExactly( - helper, - pos, - new ResourceAmount(asResource(DIRT), 10), - new ResourceAmount(asResource(STONE), 15), - new ResourceAmount(asResource(WATER), Platform.INSTANCE.getBucketAmount()) - )) - .thenSucceed(); + .thenExecute(interfaceContainsExactly( + helper, + pos.east(), + new ResourceAmount(asResource(LAVA), Platform.INSTANCE.getBucketAmount()) + )) + .thenExecute(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 10), + new ResourceAmount(asResource(STONE), 15), + new ResourceAmount(asResource(WATER), Platform.INSTANCE.getBucketAmount() * 63) + )) + .thenIdle(9) + .thenExecute(assertInterfaceEmpty(helper, pos.east())) + .thenExecute(storageContainsExactly( + helper, + pos, + new ResourceAmount(asResource(DIRT), 10), + new ResourceAmount(asResource(STONE), 15), + new ResourceAmount(asResource(WATER), Platform.INSTANCE.getBucketAmount() * 63), + new ResourceAmount(asResource(LAVA), Platform.INSTANCE.getBucketAmount()) + )) + .thenSucceed(); }); } } diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTestPlots.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTestPlots.java index fa19894f5..54d6dda48 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTestPlots.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTestPlots.java @@ -1,5 +1,8 @@ package com.refinedmods.refinedstorage.platform.common.importer; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.platform.common.iface.ExportedResourcesContainer; +import com.refinedmods.refinedstorage.platform.common.iface.InterfaceBlockEntity; import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; @@ -47,4 +50,16 @@ static void prepareChest(final GameTestHelper helper, chestBlockEntity.setItem(i, stacks[i]); } } + + static void prepareInterface(final GameTestHelper helper, + final BlockPos pos, + final ResourceAmount... resource) { + helper.setBlock(pos, RSBLOCKS.getInterface()); + final var interfaceBlockEntity = requireBlockEntity(helper, pos, InterfaceBlockEntity.class); + final ExportedResourcesContainer exportedResources = interfaceBlockEntity.getExportedResources(); + + for (int i = 0; i < resource.length; i++) { + exportedResources.set(i, resource[i]); + } + } } From 55f0ed721e4ef8f89fa44bba83bdd3f10a2c799b Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 20 Jul 2024 11:54:01 +0200 Subject: [PATCH 08/36] feat: support for neoforge config screen --- .github/workflows/build.yml | 2 +- .github/workflows/draft-release.yml | 2 +- .../issue-for-unsupported-version.yml | 2 +- .github/workflows/publish-release.yml | 2 +- .github/workflows/resolved-issue-locking.yml | 2 +- .github/workflows/validate-branch-name.yml | 2 +- .github/workflows/validate-changelog.yml | 2 +- .../workflows/validate-commit-messages.yml | 2 +- CHANGELOG.md | 2 + gradle.properties | 2 +- .../platform/common/Config.java | 4 +- .../grid/AbstractGridContainerMenu.java | 6 +- .../grid/CraftingGridContainerMenu.java | 1 + .../assets/refinedstorage/lang/en_us.json | 99 +++++- .../platform/fabric/ConfigImpl.java | 14 +- .../platform/neoforge/ConfigImpl.java | 285 +++++++++++------- .../platform/neoforge/ModInitializer.java | 3 + .../resources/META-INF/neoforge.mods.toml | 6 + 18 files changed, 301 insertions(+), 137 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8754bf00d..8ff6d7325 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: types: [ opened, synchronize, reopened ] jobs: build: - uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.16.6 + uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.16.7 with: gametests: true secrets: inherit diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index e835fe3d6..31fd1369c 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -17,7 +17,7 @@ on: type: string jobs: draft: - uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.16.6 + uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.16.7 with: release-type: ${{ inputs.release-type }} version-number-override: ${{ inputs.version-number-override }} diff --git a/.github/workflows/issue-for-unsupported-version.yml b/.github/workflows/issue-for-unsupported-version.yml index f93f0ac62..59ca50f9a 100644 --- a/.github/workflows/issue-for-unsupported-version.yml +++ b/.github/workflows/issue-for-unsupported-version.yml @@ -4,4 +4,4 @@ on: types: [ labeled, unlabeled, reopened ] jobs: unsupported-labeler: - uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.16.6 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.16.7 \ No newline at end of file diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index cd00e761b..b7a90b1a8 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -7,7 +7,7 @@ on: - closed jobs: publish-release: - uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.16.6 + uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.16.7 secrets: inherit with: project-name: 'Refined Storage' diff --git a/.github/workflows/resolved-issue-locking.yml b/.github/workflows/resolved-issue-locking.yml index 25495168a..53d3f9bbf 100644 --- a/.github/workflows/resolved-issue-locking.yml +++ b/.github/workflows/resolved-issue-locking.yml @@ -4,4 +4,4 @@ on: - cron: '0 0 * * 1' jobs: lock: - uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.16.6 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.16.7 \ No newline at end of file diff --git a/.github/workflows/validate-branch-name.yml b/.github/workflows/validate-branch-name.yml index 8d8cb7693..b13799f7b 100644 --- a/.github/workflows/validate-branch-name.yml +++ b/.github/workflows/validate-branch-name.yml @@ -2,4 +2,4 @@ name: Validate branch name on: [ pull_request ] jobs: validate-branch-name: - uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.16.6 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.16.7 \ No newline at end of file diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml index d96832f2c..47db6c5ec 100644 --- a/.github/workflows/validate-changelog.yml +++ b/.github/workflows/validate-changelog.yml @@ -4,4 +4,4 @@ on: types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ] jobs: validate-changelog: - uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.16.6 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.16.7 \ No newline at end of file diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml index f1db39522..ea9f66ebd 100644 --- a/.github/workflows/validate-commit-messages.yml +++ b/.github/workflows/validate-commit-messages.yml @@ -2,4 +2,4 @@ name: Validate commit messages on: [ pull_request ] jobs: validate-commit-messages: - uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.16.6 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.16.7 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index f6048e022..00eb37bdc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,10 +10,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Added - Ability to extract fluids from the Interface using an empty bucket or other empty fluid container. +- Support for the NeoForge config screen. ### Fixed - Fixed crash when trying to export fluids into an Interface on Fabric. +- Fixed Relay configuration not being correct on NeoForge. ## [2.0.0-milestone.4.4] - 2024-07-10 diff --git a/gradle.properties b/gradle.properties index 97542a91b..d6f86a39a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -refinedarchitectVersion=0.16.6 +refinedarchitectVersion=0.16.7 # Gradle org.gradle.jvmargs=-Xmx1G diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Config.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Config.java index 757c10b70..c9c1f19bc 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Config.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Config.java @@ -101,9 +101,9 @@ interface GridEntry extends SimpleEnergyUsageEntry { void setSortingType(GridSortingTypes sortingType); - Optional getResourceTypeId(); + Optional getResourceType(); - void setResourceTypeId(ResourceLocation resourceTypeId); + void setResourceType(ResourceLocation resourceTypeId); void clearResourceType(); } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridContainerMenu.java index 7d08ef691..c04d750fc 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridContainerMenu.java @@ -141,7 +141,7 @@ private Predicate filterStorageChannel() { return gridResource -> Platform.INSTANCE .getConfig() .getGrid() - .getResourceTypeId() + .getResourceType() .flatMap(resourceTypeId -> PlatformApi.INSTANCE .getResourceTypeRegistry() .get(resourceTypeId) @@ -323,7 +323,7 @@ private ResourceType loadResourceType() { return Platform.INSTANCE .getConfig() .getGrid() - .getResourceTypeId() + .getResourceType() .flatMap(id -> PlatformApi.INSTANCE.getResourceTypeRegistry().get(id)) .orElse(null); } @@ -358,7 +358,7 @@ public void toggleResourceType() { if (newResourceType == null) { config.clearResourceType(); } else { - registry.getId(newResourceType).ifPresent(config::setResourceTypeId); + registry.getId(newResourceType).ifPresent(config::setResourceType); } this.resourceTypeFilter = newResourceType; this.view.sort(); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridContainerMenu.java index b8bc7740b..1faa74fbd 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridContainerMenu.java @@ -83,6 +83,7 @@ public boolean canTakeItemForPickAll(final ItemStack stack, final Slot slot) { public ItemStack quickMoveStack(final Player actor, final int slotIndex) { final Slot slot = getSlot(slotIndex); if (!actor.level().isClientSide() && slot instanceof CraftingGridResultSlot resultSlot) { + // TODO: check if craftedStack is not empty. final ItemStack craftedStack = resultSlot.onQuickCraft(actor); source.acceptQuickCraft(actor, craftedStack); return ItemStack.EMPTY; diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/en_us.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/en_us.json index 828ac42e9..adf9fc563 100644 --- a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/en_us.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/en_us.json @@ -335,99 +335,194 @@ "tag.item.refinedstorage.storage_disks": "Storage Disks", "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.title": "Refined Storage Configuration", + "refinedstorage.configuration.title": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml.title": "Refined Storage Configuration", "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.smoothScrolling.tooltip": "Whether scrollbars should use smooth scrolling.", "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.screenSize.tooltip": "The screen size.", "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.maxRowsStretch.tooltip": "The maximum amount of rows that can be displayed when the screen size is stretched.", "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.tooltip": "Configuration for the Grid.", "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.largeFont.tooltip": "Whether the Grid should use a large font for quantities.", "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown.tooltip": "Whether the Grid should avoid sorting when shift is held down.", "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip.tooltip": "Whether the Grid should show a detailed tooltip.", "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery.tooltip": "Whether the search query should persist when closing and re-opening the Grid.", "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.energyUsage.tooltip": "The energy used by the Grid.", "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.autoSelected.tooltip": "Whether the search box should be auto-selected when opening the Grid.", "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.synchronizer.tooltip": "The synchronization type of the Grid search box.", + "text.autoconfig.refinedstorage.option.grid.resourceType": "Resource type", + "text.autoconfig.refinedstorage.option.grid.resourceType.tooltip": "The resource type to be shown.", "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sorting direction", + "text.autoconfig.refinedstorage.option.grid.sortingDirection.tooltip": "The sorting direction.", "text.autoconfig.refinedstorage.option.grid.sortingType": "Sorting type", + "text.autoconfig.refinedstorage.option.grid.sortingType.tooltip": "The sorting type.", "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.tooltip": "Configuration for the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage.tooltip": "The energy used by the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior.tooltip": "What should happen to the crafting matrix slots when closing the Crafting Grid.", "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.tooltip": "Configuration for the Controller.", "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.controller.energyCapacity.tooltip": "The energy capacity of the Controller.", "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.tooltip": "Configuration for the Cable.", "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.cable.energyUsage.tooltip": "The energy used by the Cable.", "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.tooltip": "Configuration for the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage.tooltip": "The energy used by the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.tooltip": "Configuration for the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage.tooltip": "The energy used by the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.tooltip": "Configuration for the Storage Blocks.", "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage.tooltip": "The energy used by the 1K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage.tooltip": "The energy used by the 4K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage.tooltip": "The energy used by the 16K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage.tooltip": "The energy used by the 64K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.tooltip": "Configuration for the Fluid Storage Blocks.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage.tooltip": "The energy used by the 64B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage.tooltip": "The energy used by the 256B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage.tooltip": "The energy used by the 1024B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage.tooltip": "The energy used by the 4096B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Fluid Storage Block.", "text.autoconfig.refinedstorage.option.importer": "Importer", + "text.autoconfig.refinedstorage.option.importer.tooltip": "Configuration for the Importer.", "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.importer.energyUsage.tooltip": "The energy used by the Importer.", "text.autoconfig.refinedstorage.option.exporter": "Exporter", + "text.autoconfig.refinedstorage.option.exporter.tooltip": "Configuration for the Exporter.", "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter.energyUsage.tooltip": "The energy used by the Exporter.", "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.tooltip": "Configuration for the Detector.", "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector.energyUsage.tooltip": "The energy used by the Detector.", "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.tooltip": "Configuration for the Constructor.", "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor.energyUsage.tooltip": "The energy used by the Constructor.", "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.tooltip": "Configuration for the Destructor.", "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor.energyUsage.tooltip": "The energy used by the Destructor.", "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.tooltip": "Configuration for the Upgrades.", "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage.tooltip": "The additional energy used per Speed Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage.tooltip": "The additional energy used by the Stack Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 1 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 2 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 3 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage.tooltip": "The additional energy used by the Silk Touch Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage.tooltip": "The additional energy used by the Regulator Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage.tooltip": "The additional energy used per Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage.tooltip": "The additional energy used by the Creative Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange.tooltip": "The additional range provided by the Range Upgrade.", "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.tooltip": "Configuration for the Interface.", "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.iface.energyUsage.tooltip": "The energy used by the Interface.", "text.autoconfig.refinedstorage.option.externalStorage": "External Storage", + "text.autoconfig.refinedstorage.option.externalStorage.tooltip": "Configuration for the External Storage.", "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage.tooltip": "The energy used by the External Storage.", "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.tooltip": "Configuration for the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity.tooltip": "The energy capacity of the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage.tooltip": "The energy used by the Wireless Grid to open.", "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage.tooltip": "The energy used by the Wireless Grid to insert resources.", "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage.tooltip": "The energy used by the Wireless Grid to extract resources.", "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.tooltip": "Configuration for the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage.tooltip": "The energy used by the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange.tooltip": "The base range of the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.tooltip": "Configuration for the Storage Monitor.", "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage.tooltip": "The energy used by the Storage Monitor.", "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.tooltip": "Configuration for the Network Receiver.", "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage.tooltip": "The energy used by the Network Receiver.", "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.tooltip": "Configuration for the Network Transmitter.", "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage.tooltip": "The energy used by the Network Transmitter.", "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.tooltip": "Configuration for the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity.tooltip": "The energy capacity of the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage.tooltip": "The energy used by the Portable Grid to open.", "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage.tooltip": "The energy used by the Portable Grid to insert resources.", "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage.tooltip": "The energy used by the Portable Grid to extract resources.", "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.tooltip": "Configuration for the Security Card.", "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage.tooltip": "The energy used by the Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.tooltip": "Configuration for the Fallback Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage.tooltip": "The energy used by the Fallback Security Card.", "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.tooltip": "Configuration for the Security Manager.", "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage.tooltip": "The energy used by the Security Manager.", "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.tooltip": "Configuration for the Relay.", "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage.tooltip": "Input network energy usage.", "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage.tooltip": "Output network energy usage (if not in pass through mode).", "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", "advancements.refinedstorage.connecting": "Connecting", "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ConfigImpl.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ConfigImpl.java index f10d2e48e..11aaf2eb3 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ConfigImpl.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ConfigImpl.java @@ -285,7 +285,7 @@ private static class GridEntryImpl implements GridEntry { private String synchronizer = ""; - private String resourceTypeId = ""; + private String resourceType = ""; private GridSortingDirection sortingDirection = GridSortingDirection.ASCENDING; @@ -370,22 +370,22 @@ public void setSortingType(final GridSortingTypes sortingType) { } @Override - public Optional getResourceTypeId() { - if (resourceTypeId.trim().isBlank()) { + public Optional getResourceType() { + if (resourceType.trim().isBlank()) { return Optional.empty(); } - return Optional.of(resourceTypeId).map(ResourceLocation::tryParse); + return Optional.of(resourceType).map(ResourceLocation::tryParse); } @Override - public void setResourceTypeId(final ResourceLocation resourceTypeId) { - this.resourceTypeId = resourceTypeId.toString(); + public void setResourceType(final ResourceLocation resourceType) { + this.resourceType = resourceType.toString(); save(); } @Override public void clearResourceType() { - this.resourceTypeId = ""; + this.resourceType = ""; save(); } diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ConfigImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ConfigImpl.java index 5b52468f1..eaeaae5cd 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ConfigImpl.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ConfigImpl.java @@ -9,9 +9,12 @@ import java.util.Optional; +import net.minecraft.client.resources.language.I18n; import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.common.ModConfigSpec; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslationKey; + public class ConfigImpl implements Config { private static final String ENERGY_USAGE = "energyUsage"; private static final String ENERGY_CAPACITY = "energyCapacity"; @@ -51,15 +54,18 @@ public class ConfigImpl implements Config { public ConfigImpl() { screenSize = builder - .comment("The screen size") + .comment(tooltipTranslation("screenSize")) + .translation(translationKey("screenSize")) .defineEnum("screenSize", ScreenSize.STRETCH); smoothScrolling = builder - .comment("Whether scrollbars should use smooth scrolling") + .comment(tooltipTranslation("smoothScrolling")) + .translation(translationKey("smoothScrolling")) .define("smoothScrolling", true); maxRowsStretch = builder - .comment("The maximum amount of rows that can be displayed when the screen size is stretched") + .comment(tooltipTranslation("maxRowsStretch")) + .translation(translationKey("maxRowsStretch")) .defineInRange("maxRowsStretch", 256, 3, 256); - cable = new SimpleEnergyUsageEntryImpl("cable", "Cable", DefaultEnergyUsage.CABLE); + cable = new SimpleEnergyUsageEntryImpl("cable", DefaultEnergyUsage.CABLE); controller = new ControllerEntryImpl(); diskDrive = new DiskDriveEntryImpl(); diskInterface = new DiskInterfaceEntryImpl(); @@ -67,51 +73,29 @@ public ConfigImpl() { craftingGrid = new CraftingGridEntryImpl(); storageBlock = new StorageBlockEntryImpl(); fluidStorageBlock = new FluidStorageBlockEntryImpl(); - importer = new SimpleEnergyUsageEntryImpl("importer", "Importer", DefaultEnergyUsage.IMPORTER); - exporter = new SimpleEnergyUsageEntryImpl("exporter", "Exporter", DefaultEnergyUsage.EXPORTER); + importer = new SimpleEnergyUsageEntryImpl("importer", DefaultEnergyUsage.IMPORTER); + exporter = new SimpleEnergyUsageEntryImpl("exporter", DefaultEnergyUsage.EXPORTER); upgrade = new UpgradeEntryImpl(); - iface = new SimpleEnergyUsageEntryImpl("interface", "Interface", DefaultEnergyUsage.INTERFACE); - externalStorage = new SimpleEnergyUsageEntryImpl( - "externalStorage", - "External Storage", - DefaultEnergyUsage.EXTERNAL_STORAGE - ); - detector = new SimpleEnergyUsageEntryImpl("detector", "Detector", DefaultEnergyUsage.DETECTOR); - destructor = new SimpleEnergyUsageEntryImpl("destructor", "Destructor", DefaultEnergyUsage.DESTRUCTOR); - constructor = new SimpleEnergyUsageEntryImpl("constructor", "Constructor", DefaultEnergyUsage.CONSTRUCTOR); + iface = new SimpleEnergyUsageEntryImpl("interface", DefaultEnergyUsage.INTERFACE); + externalStorage = new SimpleEnergyUsageEntryImpl("externalStorage", DefaultEnergyUsage.EXTERNAL_STORAGE); + detector = new SimpleEnergyUsageEntryImpl("detector", DefaultEnergyUsage.DETECTOR); + destructor = new SimpleEnergyUsageEntryImpl("destructor", DefaultEnergyUsage.DESTRUCTOR); + constructor = new SimpleEnergyUsageEntryImpl("constructor", DefaultEnergyUsage.CONSTRUCTOR); wirelessGrid = new WirelessGridEntryImpl(); wirelessTransmitter = new WirelessTransmitterEntryImpl(); - storageMonitor = new SimpleEnergyUsageEntryImpl( - "storageMonitor", - "Storage Monitor", - DefaultEnergyUsage.STORAGE_MONITOR - ); - networkReceiver = new SimpleEnergyUsageEntryImpl( - "networkReceiver", - "Network Receiver", - DefaultEnergyUsage.NETWORK_RECEIVER - ); + storageMonitor = new SimpleEnergyUsageEntryImpl("storageMonitor", DefaultEnergyUsage.STORAGE_MONITOR); + networkReceiver = new SimpleEnergyUsageEntryImpl("networkReceiver", DefaultEnergyUsage.NETWORK_RECEIVER); networkTransmitter = new SimpleEnergyUsageEntryImpl( "networkTransmitter", - "Network Transmitter", DefaultEnergyUsage.NETWORK_TRANSMITTER ); portableGrid = new PortableGridEntryImpl(); - securityCard = new SimpleEnergyUsageEntryImpl( - "securityCard", - "Security Card", - DefaultEnergyUsage.SECURITY_CARD - ); + securityCard = new SimpleEnergyUsageEntryImpl("securityCard", DefaultEnergyUsage.SECURITY_CARD); fallbackSecurityCard = new SimpleEnergyUsageEntryImpl( "fallbackSecurityCard", - "Fallback Security Card", DefaultEnergyUsage.FALLBACK_SECURITY_CARD ); - securityManager = new SimpleEnergyUsageEntryImpl( - "securityManager", - "Security Manager", - DefaultEnergyUsage.SECURITY_MANAGER - ); + securityManager = new SimpleEnergyUsageEntryImpl("securityManager", DefaultEnergyUsage.SECURITY_MANAGER); relay = new RelayEntryImpl(); spec = builder.build(); } @@ -270,13 +254,23 @@ public RelayEntry getRelay() { return relay; } + private static String translationKey(final String value) { + return createTranslationKey("text.autoconfig", "option." + value); + } + + private static String tooltipTranslation(final String value) { + return I18n.get(createTranslationKey("text.autoconfig", "option." + value + ".tooltip")); + } + private class SimpleEnergyUsageEntryImpl implements SimpleEnergyUsageEntry { private final ModConfigSpec.LongValue energyUsage; - SimpleEnergyUsageEntryImpl(final String path, final String readableName, final long defaultValue) { - builder.push(path); + SimpleEnergyUsageEntryImpl(final String path, final long defaultValue) { + final String correctedPath = "interface".equals(path) ? "iface" : path; + builder.translation(translationKey(correctedPath)).push(path); energyUsage = builder - .comment("The energy used by the " + readableName) + .comment(tooltipTranslation(correctedPath + "." + ENERGY_USAGE)) + .translation(translationKey(correctedPath + "." + ENERGY_USAGE)) .defineInRange(ENERGY_USAGE, defaultValue, 0, Long.MAX_VALUE); builder.pop(); } @@ -291,8 +285,10 @@ private class ControllerEntryImpl implements ControllerEntry { private final ModConfigSpec.LongValue energyCapacity; private ControllerEntryImpl() { - builder.push("controller"); - energyCapacity = builder.comment("The energy capacity of the Controller") + builder.translation(translationKey("controller")).push("controller"); + energyCapacity = builder + .comment(tooltipTranslation("controller." + ENERGY_CAPACITY)) + .translation(translationKey("controller." + ENERGY_CAPACITY)) .defineInRange(ENERGY_CAPACITY, DefaultEnergyUsage.CONTROLLER_CAPACITY, 0, Long.MAX_VALUE); builder.pop(); } @@ -308,10 +304,14 @@ private class DiskDriveEntryImpl implements DiskDriveEntry { private final ModConfigSpec.LongValue energyUsagePerDisk; private DiskDriveEntryImpl() { - builder.push("diskDrive"); - energyUsage = builder.comment("The energy used by the Disk Drive") + builder.translation(translationKey("diskDrive")).push("diskDrive"); + energyUsage = builder + .comment(tooltipTranslation("diskDrive." + ENERGY_USAGE)) + .translation(translationKey("diskDrive." + ENERGY_USAGE)) .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.DISK_DRIVE, 0, Long.MAX_VALUE); - energyUsagePerDisk = builder.comment("The energy used per disk") + energyUsagePerDisk = builder + .comment(tooltipTranslation("diskDrive.energyUsagePerDisk")) + .translation(translationKey("diskDrive.energyUsagePerDisk")) .defineInRange("energyUsagePerDisk", DefaultEnergyUsage.DISK_DRIVE_PER_DISK, 0, Long.MAX_VALUE); builder.pop(); } @@ -332,10 +332,14 @@ private class DiskInterfaceEntryImpl implements DiskInterfaceEntry { private final ModConfigSpec.LongValue energyUsagePerDisk; private DiskInterfaceEntryImpl() { - builder.push("diskInterface"); - energyUsage = builder.comment("The energy used by the Disk Interface") + builder.translation(translationKey("diskInterface")).push("diskInterface"); + energyUsage = builder + .comment(tooltipTranslation("diskInterface." + ENERGY_USAGE)) + .translation(translationKey("diskInterface." + ENERGY_USAGE)) .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.DISK_INTERFACE, 0, Long.MAX_VALUE); - energyUsagePerDisk = builder.comment("The energy used per disk") + energyUsagePerDisk = builder + .comment(tooltipTranslation("diskInterface.energyUsagePerDisk")) + .translation(translationKey("diskInterface.energyUsagePerDisk")) .defineInRange("energyUsagePerDisk", DefaultEnergyUsage.DISK_INTERFACE_PER_DISK, 0, Long.MAX_VALUE); builder.pop(); } @@ -364,36 +368,46 @@ private class GridEntryImpl implements GridEntry { private final ModConfigSpec.EnumValue sortingType; GridEntryImpl() { - builder.push("grid"); + builder.translation(translationKey("grid")).push("grid"); largeFont = builder - .comment("Whether the Grid should use a large font for quantities") + .comment(tooltipTranslation("grid.largeFont")) + .translation(translationKey("grid.largeFont")) .define("largeFont", false); preventSortingWhileShiftIsDown = builder - .comment("Whether the Grid should avoid sorting when shift is held down") + .comment(tooltipTranslation("grid.preventSortingWhileShiftIsDown")) + .translation(translationKey("grid.preventSortingWhileShiftIsDown")) .define("preventSortingWhileShiftIsDown", true); detailedTooltip = builder - .comment("Whether the Grid should show a detailed tooltip") + .comment(tooltipTranslation("grid.detailedTooltip")) + .translation(translationKey("grid.detailedTooltip")) .define("detailedTooltip", true); rememberSearchQuery = builder - .comment("Whether the search query should persist when closing and re-opening the Grid") + .comment(tooltipTranslation("grid.rememberSearchQuery")) + .translation(translationKey("grid.rememberSearchQuery")) .define("rememberSearchQuery", false); energyUsage = builder - .comment("The energy used by the Grid") + .comment(tooltipTranslation("grid." + ENERGY_USAGE)) + .translation(translationKey("grid." + ENERGY_USAGE)) .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.GRID, 0, Long.MAX_VALUE); autoSelected = builder - .comment("Whether the Grid search box is auto selected") + .comment(tooltipTranslation("grid.autoSelected")) + .translation(translationKey("grid.autoSelected")) .define("autoSelected", false); synchronizer = builder - .comment("The synchronization type of the Grid search box") + .comment(tooltipTranslation("grid.synchronizer")) + .translation(translationKey("grid.synchronizer")) .define("synchronizer", ""); resourceType = builder - .comment("The resource type to be shown") + .comment(tooltipTranslation("grid.resourceType")) + .translation(translationKey("grid.resourceType")) .define("resourceType", ""); sortingDirection = builder - .comment("The sorting direction") + .comment(tooltipTranslation("grid.sortingDirection")) + .translation(translationKey("grid.sortingDirection")) .defineEnum("sortingDirection", GridSortingDirection.ASCENDING); sortingType = builder - .comment("The sorting type") + .comment(tooltipTranslation("grid.sortingType")) + .translation(translationKey("grid.sortingType")) .defineEnum("sortingType", GridSortingTypes.QUANTITY); builder.pop(); } @@ -472,7 +486,7 @@ public void setSortingType(final GridSortingTypes sortingType) { } @Override - public Optional getResourceTypeId() { + public Optional getResourceType() { if (resourceType.get().trim().isBlank()) { return Optional.empty(); } @@ -480,7 +494,7 @@ public Optional getResourceTypeId() { } @Override - public void setResourceTypeId(final ResourceLocation resourceTypeId) { + public void setResourceType(final ResourceLocation resourceTypeId) { this.resourceType.set(resourceTypeId.toString()); } @@ -495,12 +509,14 @@ private class CraftingGridEntryImpl implements CraftingGridEntry { private final ModConfigSpec.EnumValue craftingMatrixCloseBehavior; CraftingGridEntryImpl() { - builder.push("craftingGrid"); + builder.translation(translationKey("craftingGrid")).push("craftingGrid"); energyUsage = builder - .comment("The energy used by the Crafting Grid") + .comment(tooltipTranslation("craftingGrid." + ENERGY_USAGE)) + .translation(translationKey("craftingGrid." + ENERGY_USAGE)) .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.CRAFTING_GRID, 0, Long.MAX_VALUE); craftingMatrixCloseBehavior = builder - .comment("What should happen to the crafting matrix slots when closing the Crafting Grid") + .comment(tooltipTranslation("craftingGrid.craftingMatrixCloseBehavior")) + .translation(translationKey("craftingGrid.craftingMatrixCloseBehavior")) .defineEnum("craftingMatrixCloseBehavior", CraftingGridMatrixCloseBehavior.NONE); builder.pop(); } @@ -521,24 +537,29 @@ private class StorageBlockEntryImpl implements StorageBlockEntry { private final ModConfigSpec.LongValue fourKEnergyUsage; private final ModConfigSpec.LongValue sixteenKEnergyUsage; private final ModConfigSpec.LongValue sixtyFourKEnergyUsage; - private final ModConfigSpec.LongValue creativeUsage; + private final ModConfigSpec.LongValue creativeEnergyUsage; StorageBlockEntryImpl() { - builder.push("storageBlock"); + builder.translation(translationKey("storageBlock")).push("storageBlock"); oneKEnergyUsage = builder - .comment("The energy used by the 1K Storage Block") + .comment(tooltipTranslation("storageBlock.oneKEnergyUsage")) + .translation(translationKey("storageBlock.oneKEnergyUsage")) .defineInRange("1kEnergyUsage", DefaultEnergyUsage.ONE_K_STORAGE_BLOCK, 0, Long.MAX_VALUE); fourKEnergyUsage = builder - .comment("The energy used by the 4K Storage Block") + .comment(tooltipTranslation("storageBlock.fourKEnergyUsage")) + .translation(translationKey("storageBlock.fourKEnergyUsage")) .defineInRange("4kEnergyUsage", DefaultEnergyUsage.FOUR_K_STORAGE_BLOCK, 0, Long.MAX_VALUE); sixteenKEnergyUsage = builder - .comment("The energy used by the 16K Storage Block") + .comment(tooltipTranslation("storageBlock.sixteenKEnergyUsage")) + .translation(translationKey("storageBlock.sixteenKEnergyUsage")) .defineInRange("16kEnergyUsage", DefaultEnergyUsage.SIXTEEN_K_STORAGE_BLOCK, 0, Long.MAX_VALUE); sixtyFourKEnergyUsage = builder - .comment("The energy used by the 64K Storage Block") + .comment(tooltipTranslation("storageBlock.sixtyFourKEnergyUsage")) + .translation(translationKey("storageBlock.sixtyFourKEnergyUsage")) .defineInRange("64kEnergyUsage", DefaultEnergyUsage.SIXTY_FOUR_K_STORAGE_BLOCK, 0, Long.MAX_VALUE); - creativeUsage = builder - .comment("The energy used by the Creative Storage Block") + creativeEnergyUsage = builder + .comment(tooltipTranslation("storageBlock.creativeEnergyUsage")) + .translation(translationKey("storageBlock.creativeEnergyUsage")) .defineInRange("creativeEnergyUsage", DefaultEnergyUsage.CREATIVE_STORAGE_BLOCK, 0, Long.MAX_VALUE); builder.pop(); } @@ -565,7 +586,7 @@ public long get64kEnergyUsage() { @Override public long getCreativeEnergyUsage() { - return creativeUsage.get(); + return creativeEnergyUsage.get(); } } @@ -574,12 +595,13 @@ private class FluidStorageBlockEntryImpl implements FluidStorageBlockEntry { private final ModConfigSpec.LongValue twoHundredFiftySixBEnergyUsage; private final ModConfigSpec.LongValue thousandTwentyFourBEnergyUsage; private final ModConfigSpec.LongValue fourThousandNinetySixBEnergyUsage; - private final ModConfigSpec.LongValue creativeUsage; + private final ModConfigSpec.LongValue creativeEnergyUsage; FluidStorageBlockEntryImpl() { - builder.push("fluidStorageBlock"); + builder.translation(translationKey("fluidStorageBlock")).push("fluidStorageBlock"); sixtyFourBEnergyUsage = builder - .comment("The energy used by the 64B Fluid Storage Block") + .comment(tooltipTranslation("fluidStorageBlock.sixtyFourBEnergyUsage")) + .translation(translationKey("fluidStorageBlock.sixtyFourBEnergyUsage")) .defineInRange( "64bEnergyUsage", DefaultEnergyUsage.SIXTY_FOUR_B_FLUID_STORAGE_BLOCK, @@ -587,7 +609,8 @@ private class FluidStorageBlockEntryImpl implements FluidStorageBlockEntry { Long.MAX_VALUE ); twoHundredFiftySixBEnergyUsage = builder - .comment("The energy used by the 256B Fluid Storage Block") + .comment(tooltipTranslation("fluidStorageBlock.twoHundredFiftySixBEnergyUsage")) + .translation(translationKey("fluidStorageBlock.twoHundredFiftySixBEnergyUsage")) .defineInRange( "256bEnergyUsage", DefaultEnergyUsage.TWO_HUNDRED_FIFTY_SIX_B_FLUID_STORAGE_BLOCK, @@ -595,7 +618,8 @@ private class FluidStorageBlockEntryImpl implements FluidStorageBlockEntry { Long.MAX_VALUE ); thousandTwentyFourBEnergyUsage = builder - .comment("The energy used by the 1024B Fluid Storage Block") + .comment(tooltipTranslation("fluidStorageBlock.thousandTwentyFourBEnergyUsage")) + .translation(translationKey("fluidStorageBlock.thousandTwentyFourBEnergyUsage")) .defineInRange( "1024bEnergyUsage", DefaultEnergyUsage.THOUSAND_TWENTY_FOUR_B_FLUID_STORAGE_BLOCK, @@ -603,15 +627,17 @@ private class FluidStorageBlockEntryImpl implements FluidStorageBlockEntry { Long.MAX_VALUE ); fourThousandNinetySixBEnergyUsage = builder - .comment("The energy used by the 4096B Fluid Storage Block") + .comment(tooltipTranslation("fluidStorageBlock.fourThousandNinetySixBEnergyUsage")) + .translation(translationKey("fluidStorageBlock.fourThousandNinetySixBEnergyUsage")) .defineInRange( "4096bEnergyUsage", DefaultEnergyUsage.FOUR_THOUSAND_NINETY_SIX_B_FLUID_STORAGE_BLOCK, 0, Long.MAX_VALUE ); - creativeUsage = builder - .comment("The energy used by the Creative Fluid Storage Block") + creativeEnergyUsage = builder + .comment(tooltipTranslation("fluidStorageBlock.creativeEnergyUsage")) + .translation(translationKey("fluidStorageBlock.creativeEnergyUsage")) .defineInRange( "creativeEnergyUsage", DefaultEnergyUsage.CREATIVE_FLUID_STORAGE_BLOCK, @@ -643,7 +669,7 @@ public long get4096bEnergyUsage() { @Override public long getCreativeEnergyUsage() { - return creativeUsage.get(); + return creativeEnergyUsage.get(); } } @@ -660,33 +686,42 @@ private class UpgradeEntryImpl implements UpgradeEntry { private final ModConfigSpec.IntValue rangeUpgradeRange; UpgradeEntryImpl() { - builder.push("upgrade"); + builder.translation(translationKey("upgrade")).push("upgrade"); speedUpgradeEnergyUsage = builder - .comment("The additional energy used per Speed Upgrade") + .comment(tooltipTranslation("upgrade.speedUpgradeEnergyUsage")) + .translation(translationKey("upgrade.speedUpgradeEnergyUsage")) .defineInRange("speedUpgradeEnergyUsage", DefaultEnergyUsage.SPEED_UPGRADE, 0, Long.MAX_VALUE); stackUpgradeEnergyUsage = builder - .comment("The additional energy used by the Stack Upgrade") + .comment(tooltipTranslation("upgrade.stackUpgradeEnergyUsage")) + .translation(translationKey("upgrade.stackUpgradeEnergyUsage")) .defineInRange("stackUpgradeEnergyUsage", DefaultEnergyUsage.STACK_UPGRADE, 0, Long.MAX_VALUE); fortune1UpgradeEnergyUsage = builder - .comment("The additional energy used by the Fortune 1 Upgrade") + .comment(tooltipTranslation("upgrade.fortune1UpgradeEnergyUsage")) + .translation(translationKey("upgrade.fortune1UpgradeEnergyUsage")) .defineInRange("fortune1UpgradeEnergyUsage", DefaultEnergyUsage.FORTUNE_1_UPGRADE, 0, Long.MAX_VALUE); fortune2UpgradeEnergyUsage = builder - .comment("The additional energy used by the Fortune 2 Upgrade") + .comment(tooltipTranslation("upgrade.fortune2UpgradeEnergyUsage")) + .translation(translationKey("upgrade.fortune2UpgradeEnergyUsage")) .defineInRange("fortune2UpgradeEnergyUsage", DefaultEnergyUsage.FORTUNE_2_UPGRADE, 0, Long.MAX_VALUE); fortune3UpgradeEnergyUsage = builder - .comment("The additional energy used by the Fortune 3 Upgrade") + .comment(tooltipTranslation("upgrade.fortune3UpgradeEnergyUsage")) + .translation(translationKey("upgrade.fortune3UpgradeEnergyUsage")) .defineInRange("fortune3UpgradeEnergyUsage", DefaultEnergyUsage.FORTUNE_3_UPGRADE, 0, Long.MAX_VALUE); silkTouchUpgradeEnergyUsage = builder - .comment("The additional energy used by the Silk Touch Upgrade") + .comment(tooltipTranslation("upgrade.silkTouchUpgradeEnergyUsage")) + .translation(translationKey("upgrade.silkTouchUpgradeEnergyUsage")) .defineInRange("silkTouchUpgradeEnergyUsage", DefaultEnergyUsage.SILK_TOUCH_UPGRADE, 0, Long.MAX_VALUE); regulatorUpgradeEnergyUsage = builder - .comment("The additional energy used by the Regulator Upgrade") + .comment(tooltipTranslation("upgrade.regulatorUpgradeEnergyUsage")) + .translation(translationKey("upgrade.regulatorUpgradeEnergyUsage")) .defineInRange("regulatorUpgradeEnergyUsage", DefaultEnergyUsage.REGULATOR_UPGRADE, 0, Long.MAX_VALUE); rangeUpgradeEnergyUsage = builder - .comment("The additional energy used by the Range Upgrade") + .comment(tooltipTranslation("upgrade.rangeUpgradeEnergyUsage")) + .translation(translationKey("upgrade.rangeUpgradeEnergyUsage")) .defineInRange("rangeUpgradeEnergyUsage", DefaultEnergyUsage.RANGE_UPGRADE, 0, Long.MAX_VALUE); creativeRangeUpgradeEnergyUsage = builder - .comment("The additional energy used by the Creative Range Upgrade") + .comment(tooltipTranslation("upgrade.creativeRangeUpgradeEnergyUsage")) + .translation(translationKey("upgrade.creativeRangeUpgradeEnergyUsage")) .defineInRange( "creativeRangeUpgradeEnergyUsage", DefaultEnergyUsage.CREATIVE_RANGE_UPGRADE, @@ -694,7 +729,8 @@ private class UpgradeEntryImpl implements UpgradeEntry { Long.MAX_VALUE ); rangeUpgradeRange = builder - .comment("The additional range by the Range Upgrade") + .comment(tooltipTranslation("upgrade.rangeUpgradeRange")) + .translation(translationKey("upgrade.rangeUpgradeRange")) .defineInRange("rangeUpgradeRange", DefaultEnergyUsage.RANGE_UPGRADE_RANGE, 0, Integer.MAX_VALUE); builder.pop(); } @@ -757,14 +793,22 @@ private class WirelessGridEntryImpl implements WirelessGridEntry { private final ModConfigSpec.LongValue insertEnergyUsage; WirelessGridEntryImpl() { - builder.push("wirelessGrid"); - energyCapacity = builder.comment("The energy capacity of the Wireless Grid") + builder.translation(translationKey("wirelessGrid")).push("wirelessGrid"); + energyCapacity = builder + .comment(tooltipTranslation("wirelessGrid." + ENERGY_CAPACITY)) + .translation(translationKey("wirelessGrid." + ENERGY_CAPACITY)) .defineInRange(ENERGY_CAPACITY, DefaultEnergyUsage.WIRELESS_GRID_CAPACITY, 0, Long.MAX_VALUE); - openEnergyUsage = builder.comment("The energy used by the Wireless Grid to open") + openEnergyUsage = builder + .comment(tooltipTranslation("wirelessGrid.openEnergyUsage")) + .translation(translationKey("wirelessGrid.openEnergyUsage")) .defineInRange("openEnergyUsage", DefaultEnergyUsage.WIRELESS_GRID_OPEN, 0, Long.MAX_VALUE); - extractEnergyUsage = builder.comment("The energy used by the Wireless Grid to extract resources") + extractEnergyUsage = builder + .comment(tooltipTranslation("wirelessGrid.extractEnergyUsage")) + .translation(translationKey("wirelessGrid.extractEnergyUsage")) .defineInRange("extractEnergyUsage", DefaultEnergyUsage.WIRELESS_GRID_EXTRACT, 0, Long.MAX_VALUE); - insertEnergyUsage = builder.comment("The energy used by the Wireless Grid to insert resources") + insertEnergyUsage = builder + .comment(tooltipTranslation("wirelessGrid.insertEnergyUsage")) + .translation(translationKey("wirelessGrid.insertEnergyUsage")) .defineInRange("insertEnergyUsage", DefaultEnergyUsage.WIRELESS_GRID_INSERT, 0, Long.MAX_VALUE); builder.pop(); } @@ -791,13 +835,15 @@ private class WirelessTransmitterEntryImpl implements WirelessTransmitterEntry { private final ModConfigSpec.IntValue baseRange; WirelessTransmitterEntryImpl() { - builder.push("wirelessTransmitter"); - - energyUsage = builder.comment("The energy used by the Wireless Transmitter") + builder.translation(translationKey("wirelessTransmitter")).push("wirelessTransmitter"); + energyUsage = builder + .comment(tooltipTranslation("wirelessTransmitter." + ENERGY_USAGE)) + .translation(translationKey("wirelessTransmitter." + ENERGY_USAGE)) .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.WIRELESS_TRANSMITTER, 0, Long.MAX_VALUE); - baseRange = builder.comment("The base range of the Wireless Transmitter") + baseRange = builder + .comment(tooltipTranslation("wirelessTransmitter.baseRange")) + .translation(translationKey("wirelessTransmitter.baseRange")) .defineInRange("baseRange", DefaultEnergyUsage.WIRELESS_TRANSMITTER_BASE_RANGE, 0, Integer.MAX_VALUE); - builder.pop(); } @@ -817,14 +863,22 @@ private class PortableGridEntryImpl implements PortableGridEntry { private final ModConfigSpec.LongValue insertEnergyUsage; PortableGridEntryImpl() { - builder.push("portableGrid"); - energyCapacity = builder.comment("The energy capacity of the Portable Grid") + builder.translation(translationKey("portableGrid")).push("portableGrid"); + energyCapacity = builder + .comment(tooltipTranslation("portableGrid." + ENERGY_CAPACITY)) + .translation(translationKey("portableGrid." + ENERGY_CAPACITY)) .defineInRange(ENERGY_CAPACITY, DefaultEnergyUsage.PORTABLE_GRID_CAPACITY, 0, Long.MAX_VALUE); - openEnergyUsage = builder.comment("The energy used by the Portable Grid to open") + openEnergyUsage = builder + .comment(tooltipTranslation("portableGrid.openEnergyUsage")) + .translation(translationKey("portableGrid.openEnergyUsage")) .defineInRange("openEnergyUsage", DefaultEnergyUsage.PORTABLE_GRID_OPEN, 0, Long.MAX_VALUE); - extractEnergyUsage = builder.comment("The energy used by the Portable Grid to extract resources") + extractEnergyUsage = builder + .comment(tooltipTranslation("portableGrid.extractEnergyUsage")) + .translation(translationKey("portableGrid.extractEnergyUsage")) .defineInRange("extractEnergyUsage", DefaultEnergyUsage.PORTABLE_GRID_EXTRACT, 0, Long.MAX_VALUE); - insertEnergyUsage = builder.comment("The energy used by the Portable Grid to insert resources") + insertEnergyUsage = builder + .comment(tooltipTranslation("portableGrid.insertEnergyUsage")) + .translation(translationKey("portableGrid.insertEnergyUsage")) .defineInRange("insertEnergyUsage", DefaultEnergyUsage.PORTABLE_GRID_INSERT, 0, Long.MAX_VALUE); builder.pop(); } @@ -851,12 +905,15 @@ private class RelayEntryImpl implements RelayEntry { private final ModConfigSpec.LongValue outputNetworkEnergyUsage; RelayEntryImpl() { - builder.push("relay"); - inputNetworkEnergyUsage = builder.comment("The energy used by the Relay in the input network") - .defineInRange(ENERGY_CAPACITY, DefaultEnergyUsage.RELAY_INPUT_NETWORK, 8, Long.MAX_VALUE); - outputNetworkEnergyUsage = builder.comment( - "The energy used by the Relay in the output network (if not in pass through mode)" - ).defineInRange(ENERGY_CAPACITY, DefaultEnergyUsage.RELAY_OUTPUT_NETWORK, 8, Long.MAX_VALUE); + builder.translation(translationKey("relay")).push("relay"); + inputNetworkEnergyUsage = builder + .comment(tooltipTranslation("relay.inputNetworkEnergyUsage")) + .translation(translationKey("relay.inputNetworkEnergyUsage")) + .defineInRange("inputNetworkEnergyUsage", DefaultEnergyUsage.RELAY_INPUT_NETWORK, 8, Long.MAX_VALUE); + outputNetworkEnergyUsage = builder + .comment(tooltipTranslation("relay.outputNetworkEnergyUsage")) + .translation(translationKey("relay.outputNetworkEnergyUsage")) + .defineInRange("outputNetworkEnergyUsage", DefaultEnergyUsage.RELAY_OUTPUT_NETWORK, 8, Long.MAX_VALUE); builder.pop(); } diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ModInitializer.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ModInitializer.java index 32c6ce5a7..f520edbb1 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ModInitializer.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ModInitializer.java @@ -101,6 +101,8 @@ import net.neoforged.fml.loading.FMLEnvironment; import net.neoforged.neoforge.capabilities.Capabilities; import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; +import net.neoforged.neoforge.client.gui.ConfigurationScreen; +import net.neoforged.neoforge.client.gui.IConfigScreenFactory; import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.common.extensions.IMenuTypeExtension; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; @@ -162,6 +164,7 @@ public ModInitializer(final IEventBus eventBus, final ModContainer modContainer) eventBus.addListener(ClientModInitializer::onRegisterMenuScreens); eventBus.addListener(ClientModInitializer::onRegisterKeyMappings); eventBus.addListener(ClientModInitializer::onRegisterTooltipFactories); + modContainer.registerExtensionPoint(IConfigScreenFactory.class, ConfigurationScreen::new); } eventBus.addListener(this::onCommonSetup); diff --git a/refinedstorage-platform-neoforge/src/main/resources/META-INF/neoforge.mods.toml b/refinedstorage-platform-neoforge/src/main/resources/META-INF/neoforge.mods.toml index 1148ab8a3..f24984832 100644 --- a/refinedstorage-platform-neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/refinedstorage-platform-neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -12,3 +12,9 @@ authors = "Refined Mods" description = ''' Refined Storage is a mass storage mod for Minecraft that offers the player a network-based storage system, allowing them to store items and fluids on a massively expandable device network. ''' +[[dependencies.refinedstorage]] +modId="neoforge" +type="required" +versionRange="[21.0.112-beta,)" +ordering="NONE" +side="BOTH" From d6756d08c082b36efa39edd87f0340e0b8034241 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 20 Jul 2024 13:21:31 +0200 Subject: [PATCH 09/36] fix: use neoforge safe saveddata saving We no longer need to implement this ourselves for NeoForge. For Fabric, keep the existing patch. See: https://github.com/neoforged/NeoForge/pull/1001 --- .../platform/common/Platform.java | 9 ++++ .../platform/common/PlatformProxy.java | 12 +++++ .../common/storage/StorageRepositoryImpl.java | 4 +- .../support/AbstractPlatformSavedData.java | 15 ++++++ .../common/support/AbstractSafeSavedData.java | 51 ------------------- .../platform/common/TestPlatform.java | 10 ++++ .../platform/fabric/PlatformImpl.java | 48 +++++++++++++++++ .../platform/neoforge/PlatformImpl.java | 12 +++++ 8 files changed, 108 insertions(+), 53 deletions(-) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractPlatformSavedData.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractSafeSavedData.java diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Platform.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Platform.java index 43969db56..80e778851 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Platform.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Platform.java @@ -12,9 +12,11 @@ import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import java.io.File; import java.util.List; import java.util.Optional; import java.util.UUID; +import java.util.function.BiConsumer; import javax.annotation.Nullable; import net.minecraft.client.KeyMapping; @@ -23,6 +25,7 @@ import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; @@ -42,6 +45,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.saveddata.SavedData; import net.minecraft.world.phys.BlockHitResult; public interface Platform { @@ -115,4 +119,9 @@ List processTooltipComponents( void sendPacketToServer(T packet); void sendPacketToClient(ServerPlayer player, T packet); + + void saveSavedData(SavedData savedData, + File file, + HolderLookup.Provider provider, + BiConsumer defaultSaveFunction); } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformProxy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformProxy.java index c6b922ace..26da46da9 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformProxy.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformProxy.java @@ -12,9 +12,11 @@ import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import java.io.File; import java.util.List; import java.util.Optional; import java.util.UUID; +import java.util.function.BiConsumer; import javax.annotation.Nullable; import net.minecraft.client.KeyMapping; @@ -23,6 +25,7 @@ import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; @@ -42,6 +45,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.saveddata.SavedData; import net.minecraft.world.phys.BlockHitResult; public class PlatformProxy implements Platform { @@ -225,6 +229,14 @@ public void sendPacketToClient(final ServerPlaye ensureLoaded().sendPacketToClient(player, packet); } + @Override + public void saveSavedData(final SavedData savedData, + final File file, + final HolderLookup.Provider provider, + final BiConsumer defaultSaveFunction) { + ensureLoaded().saveSavedData(savedData, file, provider, defaultSaveFunction); + } + private Platform ensureLoaded() { if (platform == null) { throw new IllegalStateException("Platform not loaded yet"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageRepositoryImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageRepositoryImpl.java index 9cfb1055d..559a59a73 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageRepositoryImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageRepositoryImpl.java @@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage.platform.common.support.AbstractSafeSavedData; +import com.refinedmods.refinedstorage.platform.common.support.AbstractPlatformSavedData; import java.util.HashMap; import java.util.Map; @@ -17,7 +17,7 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtOps; -public class StorageRepositoryImpl extends AbstractSafeSavedData implements StorageRepository { +public class StorageRepositoryImpl extends AbstractPlatformSavedData implements StorageRepository { public static final String NAME = "refinedstorage_storages"; private final Codec> codec = Codec.unboundedMap( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractPlatformSavedData.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractPlatformSavedData.java new file mode 100644 index 000000000..5ce78d0a7 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractPlatformSavedData.java @@ -0,0 +1,15 @@ +package com.refinedmods.refinedstorage.platform.common.support; + +import com.refinedmods.refinedstorage.platform.common.Platform; + +import java.io.File; + +import net.minecraft.core.HolderLookup; +import net.minecraft.world.level.saveddata.SavedData; + +public abstract class AbstractPlatformSavedData extends SavedData { + @Override + public final void save(final File file, final HolderLookup.Provider provider) { + Platform.INSTANCE.saveSavedData(this, file, provider, super::save); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractSafeSavedData.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractSafeSavedData.java deleted file mode 100644 index d920b5f0d..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractSafeSavedData.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.refinedmods.refinedstorage.platform.common.support; - -import java.io.File; -import java.io.IOException; -import java.nio.file.AtomicMoveNotSupportedException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardCopyOption; - -import com.mojang.logging.LogUtils; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.NbtIo; -import net.minecraft.nbt.NbtUtils; -import net.minecraft.world.level.saveddata.SavedData; -import org.slf4j.Logger; - -public abstract class AbstractSafeSavedData extends SavedData { - private static final Logger LOGGER = LogUtils.getLogger(); - - @Override - public void save(final File file, final HolderLookup.Provider provider) { - if (!isDirty()) { - return; - } - final var targetPath = file.toPath().toAbsolutePath(); - final var tempFile = targetPath.getParent().resolve(file.getName() + ".temp"); - final CompoundTag compoundTag = new CompoundTag(); - compoundTag.put("data", this.save(new CompoundTag(), provider)); - NbtUtils.addCurrentDataVersion(compoundTag); - try { - doSave(compoundTag, tempFile, targetPath); - } catch (final IOException e) { - LOGGER.error("Could not save data {}", this, e); - } - setDirty(false); - } - - private void doSave(final CompoundTag compoundTag, - final Path tempFile, - final Path targetPath) throws IOException { - // Write to temp file first. - NbtIo.writeCompressed(compoundTag, tempFile); - // Try atomic move - try { - Files.move(tempFile, targetPath, StandardCopyOption.ATOMIC_MOVE); - } catch (final AtomicMoveNotSupportedException ignored) { - Files.move(tempFile, targetPath, StandardCopyOption.REPLACE_EXISTING); - } - } -} diff --git a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/TestPlatform.java b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/TestPlatform.java index 199ec9da4..b6d371334 100644 --- a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/TestPlatform.java +++ b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/TestPlatform.java @@ -12,9 +12,11 @@ import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import java.io.File; import java.util.List; import java.util.Optional; import java.util.UUID; +import java.util.function.BiConsumer; import javax.annotation.Nullable; import net.minecraft.client.KeyMapping; @@ -23,6 +25,7 @@ import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; @@ -42,6 +45,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.saveddata.SavedData; import net.minecraft.world.phys.BlockHitResult; public class TestPlatform implements Platform { @@ -202,4 +206,10 @@ public void sendPacketToServer(final T packet) { public void sendPacketToClient(final ServerPlayer player, final T packet) { throw new UnsupportedOperationException(); } + + @Override + public void saveSavedData(final SavedData savedData, final File file, final HolderLookup.Provider provider, + final BiConsumer defaultSaveFunction) { + throw new UnsupportedOperationException(); + } } diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/PlatformImpl.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/PlatformImpl.java index afa8b3e6c..50f91f096 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/PlatformImpl.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/PlatformImpl.java @@ -22,9 +22,16 @@ import com.refinedmods.refinedstorage.platform.fabric.support.render.FluidVariantFluidRenderer; import com.refinedmods.refinedstorage.platform.fabric.util.SimpleSingleStackStorage; +import java.io.File; +import java.io.IOException; +import java.nio.file.AtomicMoveNotSupportedException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; import java.util.List; import java.util.Optional; import java.util.UUID; +import java.util.function.BiConsumer; import java.util.stream.Collectors; import javax.annotation.Nullable; @@ -51,7 +58,11 @@ import net.minecraft.client.gui.screens.inventory.tooltip.DefaultTooltipPositioner; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; import net.minecraft.core.NonNullList; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NbtIo; +import net.minecraft.nbt.NbtUtils; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.server.level.ServerLevel; @@ -82,14 +93,19 @@ import net.minecraft.world.level.material.FlowingFluid; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.Fluids; +import net.minecraft.world.level.saveddata.SavedData; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.ofFluidVariant; import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.toFluidVariant; import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.toItemVariant; public final class PlatformImpl extends AbstractPlatform { + private static final Logger LOGGER = LoggerFactory.getLogger(PlatformImpl.class); + public PlatformImpl() { super(new MenuOpenerImpl(), new FluidVariantFluidRenderer(), ItemGridInsertionStrategy::new); } @@ -391,4 +407,36 @@ public void sendPacketToServer(final T packet) { public void sendPacketToClient(final ServerPlayer player, final T packet) { ServerPlayNetworking.send(player, packet); } + + @Override + public void saveSavedData(final SavedData savedData, + final File file, + final HolderLookup.Provider provider, + final BiConsumer defaultSaveFunction) { + if (!savedData.isDirty()) { + return; + } + final var targetPath = file.toPath().toAbsolutePath(); + final var tempFile = targetPath.getParent().resolve(file.getName() + ".temp"); + final CompoundTag compoundTag = new CompoundTag(); + compoundTag.put("data", savedData.save(new CompoundTag(), provider)); + NbtUtils.addCurrentDataVersion(compoundTag); + try { + doSave(compoundTag, tempFile, targetPath); + } catch (final IOException e) { + LOGGER.error("Could not save data", e); + } + savedData.setDirty(false); + } + + private void doSave(final CompoundTag compoundTag, final Path tempFile, final Path targetPath) throws IOException { + // Write to temp file first. + NbtIo.writeCompressed(compoundTag, tempFile); + // Try atomic move + try { + Files.move(tempFile, targetPath, StandardCopyOption.ATOMIC_MOVE); + } catch (final AtomicMoveNotSupportedException ignored) { + Files.move(tempFile, targetPath, StandardCopyOption.REPLACE_EXISTING); + } + } } diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/PlatformImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/PlatformImpl.java index 79e0b7ad2..abbcd4db3 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/PlatformImpl.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/PlatformImpl.java @@ -19,10 +19,12 @@ import com.refinedmods.refinedstorage.platform.neoforge.support.energy.EnergyStorageAdapter; import com.refinedmods.refinedstorage.platform.neoforge.support.render.FluidStackFluidRenderer; +import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.UUID; +import java.util.function.BiConsumer; import javax.annotation.Nullable; import com.mojang.blaze3d.platform.InputConstants; @@ -34,6 +36,7 @@ import net.minecraft.client.gui.screens.inventory.tooltip.DefaultTooltipPositioner; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; @@ -57,6 +60,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.saveddata.SavedData; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; import net.neoforged.fml.ModContainer; @@ -337,4 +341,12 @@ public void sendPacketToServer(final T packet) { public void sendPacketToClient(final ServerPlayer player, final T packet) { PacketDistributor.sendToPlayer(player, packet); } + + @Override + public void saveSavedData(final SavedData savedData, + final File file, + final HolderLookup.Provider provider, + final BiConsumer defaultSaveFunction) { + defaultSaveFunction.accept(file, provider); + } } From 8da072fbb1d72b8e3d35e31d90d863e160becb9d Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 20 Jul 2024 13:24:50 +0200 Subject: [PATCH 10/36] fix: crash in logs when trying to quick craft empty result slot --- CHANGELOG.md | 9 +++++---- .../platform/common/grid/CraftingGridContainerMenu.java | 5 +++-- .../platform/common/grid/CraftingGridResultSlot.java | 4 ---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00eb37bdc..c104852a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,13 +9,14 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Added -- Ability to extract fluids from the Interface using an empty bucket or other empty fluid container. -- Support for the NeoForge config screen. +- Ability to extract fluids from the Interface using an empty bucket or other empty fluid container. +- Support for the NeoForge config screen. ### Fixed -- Fixed crash when trying to export fluids into an Interface on Fabric. -- Fixed Relay configuration not being correct on NeoForge. +- Fixed crash when trying to export fluids into an Interface on Fabric. +- Fixed Relay configuration not being correct on NeoForge. +- Fixed crash in logs when trying to quick craft an empty result slot in the Crafting Grid. ## [2.0.0-milestone.4.4] - 2024-07-10 diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridContainerMenu.java index 1faa74fbd..2ba845e6c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridContainerMenu.java @@ -82,8 +82,9 @@ public boolean canTakeItemForPickAll(final ItemStack stack, final Slot slot) { @SuppressWarnings("resource") public ItemStack quickMoveStack(final Player actor, final int slotIndex) { final Slot slot = getSlot(slotIndex); - if (!actor.level().isClientSide() && slot instanceof CraftingGridResultSlot resultSlot) { - // TODO: check if craftedStack is not empty. + if (!actor.level().isClientSide() + && slot instanceof CraftingGridResultSlot resultSlot + && resultSlot.hasItem()) { final ItemStack craftedStack = resultSlot.onQuickCraft(actor); source.acceptQuickCraft(actor, craftedStack); return ItemStack.EMPTY; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridResultSlot.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridResultSlot.java index 72eda3aaa..517ecb752 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridResultSlot.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridResultSlot.java @@ -23,11 +23,7 @@ class CraftingGridResultSlot extends ResultSlot { this.source = source; } - @SuppressWarnings("resource") public ItemStack onQuickCraft(final Player player) { - if (!hasItem() || player.level().isClientSide()) { - return ItemStack.EMPTY; - } final ItemStack singleResultStack = getItem().copy(); final int maxCrafted = singleResultStack.getMaxStackSize(); int crafted = 0; From ee0c73a3a47b23aaf36971ddd6551d9837bab046 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 20 Jul 2024 13:33:27 +0200 Subject: [PATCH 11/36] fix: remove comments using tooltip translations It doesn't work on servers, and on the client the translations are loaded too late. --- .../platform/neoforge/ConfigImpl.java | 58 ------------------- 1 file changed, 58 deletions(-) diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ConfigImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ConfigImpl.java index eaeaae5cd..ba59c7d90 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ConfigImpl.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ConfigImpl.java @@ -9,7 +9,6 @@ import java.util.Optional; -import net.minecraft.client.resources.language.I18n; import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.common.ModConfigSpec; @@ -54,15 +53,12 @@ public class ConfigImpl implements Config { public ConfigImpl() { screenSize = builder - .comment(tooltipTranslation("screenSize")) .translation(translationKey("screenSize")) .defineEnum("screenSize", ScreenSize.STRETCH); smoothScrolling = builder - .comment(tooltipTranslation("smoothScrolling")) .translation(translationKey("smoothScrolling")) .define("smoothScrolling", true); maxRowsStretch = builder - .comment(tooltipTranslation("maxRowsStretch")) .translation(translationKey("maxRowsStretch")) .defineInRange("maxRowsStretch", 256, 3, 256); cable = new SimpleEnergyUsageEntryImpl("cable", DefaultEnergyUsage.CABLE); @@ -258,10 +254,6 @@ private static String translationKey(final String value) { return createTranslationKey("text.autoconfig", "option." + value); } - private static String tooltipTranslation(final String value) { - return I18n.get(createTranslationKey("text.autoconfig", "option." + value + ".tooltip")); - } - private class SimpleEnergyUsageEntryImpl implements SimpleEnergyUsageEntry { private final ModConfigSpec.LongValue energyUsage; @@ -269,7 +261,6 @@ private class SimpleEnergyUsageEntryImpl implements SimpleEnergyUsageEntry { final String correctedPath = "interface".equals(path) ? "iface" : path; builder.translation(translationKey(correctedPath)).push(path); energyUsage = builder - .comment(tooltipTranslation(correctedPath + "." + ENERGY_USAGE)) .translation(translationKey(correctedPath + "." + ENERGY_USAGE)) .defineInRange(ENERGY_USAGE, defaultValue, 0, Long.MAX_VALUE); builder.pop(); @@ -287,7 +278,6 @@ private class ControllerEntryImpl implements ControllerEntry { private ControllerEntryImpl() { builder.translation(translationKey("controller")).push("controller"); energyCapacity = builder - .comment(tooltipTranslation("controller." + ENERGY_CAPACITY)) .translation(translationKey("controller." + ENERGY_CAPACITY)) .defineInRange(ENERGY_CAPACITY, DefaultEnergyUsage.CONTROLLER_CAPACITY, 0, Long.MAX_VALUE); builder.pop(); @@ -306,11 +296,9 @@ private class DiskDriveEntryImpl implements DiskDriveEntry { private DiskDriveEntryImpl() { builder.translation(translationKey("diskDrive")).push("diskDrive"); energyUsage = builder - .comment(tooltipTranslation("diskDrive." + ENERGY_USAGE)) .translation(translationKey("diskDrive." + ENERGY_USAGE)) .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.DISK_DRIVE, 0, Long.MAX_VALUE); energyUsagePerDisk = builder - .comment(tooltipTranslation("diskDrive.energyUsagePerDisk")) .translation(translationKey("diskDrive.energyUsagePerDisk")) .defineInRange("energyUsagePerDisk", DefaultEnergyUsage.DISK_DRIVE_PER_DISK, 0, Long.MAX_VALUE); builder.pop(); @@ -334,11 +322,9 @@ private class DiskInterfaceEntryImpl implements DiskInterfaceEntry { private DiskInterfaceEntryImpl() { builder.translation(translationKey("diskInterface")).push("diskInterface"); energyUsage = builder - .comment(tooltipTranslation("diskInterface." + ENERGY_USAGE)) .translation(translationKey("diskInterface." + ENERGY_USAGE)) .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.DISK_INTERFACE, 0, Long.MAX_VALUE); energyUsagePerDisk = builder - .comment(tooltipTranslation("diskInterface.energyUsagePerDisk")) .translation(translationKey("diskInterface.energyUsagePerDisk")) .defineInRange("energyUsagePerDisk", DefaultEnergyUsage.DISK_INTERFACE_PER_DISK, 0, Long.MAX_VALUE); builder.pop(); @@ -370,43 +356,33 @@ private class GridEntryImpl implements GridEntry { GridEntryImpl() { builder.translation(translationKey("grid")).push("grid"); largeFont = builder - .comment(tooltipTranslation("grid.largeFont")) .translation(translationKey("grid.largeFont")) .define("largeFont", false); preventSortingWhileShiftIsDown = builder - .comment(tooltipTranslation("grid.preventSortingWhileShiftIsDown")) .translation(translationKey("grid.preventSortingWhileShiftIsDown")) .define("preventSortingWhileShiftIsDown", true); detailedTooltip = builder - .comment(tooltipTranslation("grid.detailedTooltip")) .translation(translationKey("grid.detailedTooltip")) .define("detailedTooltip", true); rememberSearchQuery = builder - .comment(tooltipTranslation("grid.rememberSearchQuery")) .translation(translationKey("grid.rememberSearchQuery")) .define("rememberSearchQuery", false); energyUsage = builder - .comment(tooltipTranslation("grid." + ENERGY_USAGE)) .translation(translationKey("grid." + ENERGY_USAGE)) .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.GRID, 0, Long.MAX_VALUE); autoSelected = builder - .comment(tooltipTranslation("grid.autoSelected")) .translation(translationKey("grid.autoSelected")) .define("autoSelected", false); synchronizer = builder - .comment(tooltipTranslation("grid.synchronizer")) .translation(translationKey("grid.synchronizer")) .define("synchronizer", ""); resourceType = builder - .comment(tooltipTranslation("grid.resourceType")) .translation(translationKey("grid.resourceType")) .define("resourceType", ""); sortingDirection = builder - .comment(tooltipTranslation("grid.sortingDirection")) .translation(translationKey("grid.sortingDirection")) .defineEnum("sortingDirection", GridSortingDirection.ASCENDING); sortingType = builder - .comment(tooltipTranslation("grid.sortingType")) .translation(translationKey("grid.sortingType")) .defineEnum("sortingType", GridSortingTypes.QUANTITY); builder.pop(); @@ -511,11 +487,9 @@ private class CraftingGridEntryImpl implements CraftingGridEntry { CraftingGridEntryImpl() { builder.translation(translationKey("craftingGrid")).push("craftingGrid"); energyUsage = builder - .comment(tooltipTranslation("craftingGrid." + ENERGY_USAGE)) .translation(translationKey("craftingGrid." + ENERGY_USAGE)) .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.CRAFTING_GRID, 0, Long.MAX_VALUE); craftingMatrixCloseBehavior = builder - .comment(tooltipTranslation("craftingGrid.craftingMatrixCloseBehavior")) .translation(translationKey("craftingGrid.craftingMatrixCloseBehavior")) .defineEnum("craftingMatrixCloseBehavior", CraftingGridMatrixCloseBehavior.NONE); builder.pop(); @@ -542,23 +516,18 @@ private class StorageBlockEntryImpl implements StorageBlockEntry { StorageBlockEntryImpl() { builder.translation(translationKey("storageBlock")).push("storageBlock"); oneKEnergyUsage = builder - .comment(tooltipTranslation("storageBlock.oneKEnergyUsage")) .translation(translationKey("storageBlock.oneKEnergyUsage")) .defineInRange("1kEnergyUsage", DefaultEnergyUsage.ONE_K_STORAGE_BLOCK, 0, Long.MAX_VALUE); fourKEnergyUsage = builder - .comment(tooltipTranslation("storageBlock.fourKEnergyUsage")) .translation(translationKey("storageBlock.fourKEnergyUsage")) .defineInRange("4kEnergyUsage", DefaultEnergyUsage.FOUR_K_STORAGE_BLOCK, 0, Long.MAX_VALUE); sixteenKEnergyUsage = builder - .comment(tooltipTranslation("storageBlock.sixteenKEnergyUsage")) .translation(translationKey("storageBlock.sixteenKEnergyUsage")) .defineInRange("16kEnergyUsage", DefaultEnergyUsage.SIXTEEN_K_STORAGE_BLOCK, 0, Long.MAX_VALUE); sixtyFourKEnergyUsage = builder - .comment(tooltipTranslation("storageBlock.sixtyFourKEnergyUsage")) .translation(translationKey("storageBlock.sixtyFourKEnergyUsage")) .defineInRange("64kEnergyUsage", DefaultEnergyUsage.SIXTY_FOUR_K_STORAGE_BLOCK, 0, Long.MAX_VALUE); creativeEnergyUsage = builder - .comment(tooltipTranslation("storageBlock.creativeEnergyUsage")) .translation(translationKey("storageBlock.creativeEnergyUsage")) .defineInRange("creativeEnergyUsage", DefaultEnergyUsage.CREATIVE_STORAGE_BLOCK, 0, Long.MAX_VALUE); builder.pop(); @@ -600,7 +569,6 @@ private class FluidStorageBlockEntryImpl implements FluidStorageBlockEntry { FluidStorageBlockEntryImpl() { builder.translation(translationKey("fluidStorageBlock")).push("fluidStorageBlock"); sixtyFourBEnergyUsage = builder - .comment(tooltipTranslation("fluidStorageBlock.sixtyFourBEnergyUsage")) .translation(translationKey("fluidStorageBlock.sixtyFourBEnergyUsage")) .defineInRange( "64bEnergyUsage", @@ -609,7 +577,6 @@ private class FluidStorageBlockEntryImpl implements FluidStorageBlockEntry { Long.MAX_VALUE ); twoHundredFiftySixBEnergyUsage = builder - .comment(tooltipTranslation("fluidStorageBlock.twoHundredFiftySixBEnergyUsage")) .translation(translationKey("fluidStorageBlock.twoHundredFiftySixBEnergyUsage")) .defineInRange( "256bEnergyUsage", @@ -618,7 +585,6 @@ private class FluidStorageBlockEntryImpl implements FluidStorageBlockEntry { Long.MAX_VALUE ); thousandTwentyFourBEnergyUsage = builder - .comment(tooltipTranslation("fluidStorageBlock.thousandTwentyFourBEnergyUsage")) .translation(translationKey("fluidStorageBlock.thousandTwentyFourBEnergyUsage")) .defineInRange( "1024bEnergyUsage", @@ -627,7 +593,6 @@ private class FluidStorageBlockEntryImpl implements FluidStorageBlockEntry { Long.MAX_VALUE ); fourThousandNinetySixBEnergyUsage = builder - .comment(tooltipTranslation("fluidStorageBlock.fourThousandNinetySixBEnergyUsage")) .translation(translationKey("fluidStorageBlock.fourThousandNinetySixBEnergyUsage")) .defineInRange( "4096bEnergyUsage", @@ -636,7 +601,6 @@ private class FluidStorageBlockEntryImpl implements FluidStorageBlockEntry { Long.MAX_VALUE ); creativeEnergyUsage = builder - .comment(tooltipTranslation("fluidStorageBlock.creativeEnergyUsage")) .translation(translationKey("fluidStorageBlock.creativeEnergyUsage")) .defineInRange( "creativeEnergyUsage", @@ -688,39 +652,30 @@ private class UpgradeEntryImpl implements UpgradeEntry { UpgradeEntryImpl() { builder.translation(translationKey("upgrade")).push("upgrade"); speedUpgradeEnergyUsage = builder - .comment(tooltipTranslation("upgrade.speedUpgradeEnergyUsage")) .translation(translationKey("upgrade.speedUpgradeEnergyUsage")) .defineInRange("speedUpgradeEnergyUsage", DefaultEnergyUsage.SPEED_UPGRADE, 0, Long.MAX_VALUE); stackUpgradeEnergyUsage = builder - .comment(tooltipTranslation("upgrade.stackUpgradeEnergyUsage")) .translation(translationKey("upgrade.stackUpgradeEnergyUsage")) .defineInRange("stackUpgradeEnergyUsage", DefaultEnergyUsage.STACK_UPGRADE, 0, Long.MAX_VALUE); fortune1UpgradeEnergyUsage = builder - .comment(tooltipTranslation("upgrade.fortune1UpgradeEnergyUsage")) .translation(translationKey("upgrade.fortune1UpgradeEnergyUsage")) .defineInRange("fortune1UpgradeEnergyUsage", DefaultEnergyUsage.FORTUNE_1_UPGRADE, 0, Long.MAX_VALUE); fortune2UpgradeEnergyUsage = builder - .comment(tooltipTranslation("upgrade.fortune2UpgradeEnergyUsage")) .translation(translationKey("upgrade.fortune2UpgradeEnergyUsage")) .defineInRange("fortune2UpgradeEnergyUsage", DefaultEnergyUsage.FORTUNE_2_UPGRADE, 0, Long.MAX_VALUE); fortune3UpgradeEnergyUsage = builder - .comment(tooltipTranslation("upgrade.fortune3UpgradeEnergyUsage")) .translation(translationKey("upgrade.fortune3UpgradeEnergyUsage")) .defineInRange("fortune3UpgradeEnergyUsage", DefaultEnergyUsage.FORTUNE_3_UPGRADE, 0, Long.MAX_VALUE); silkTouchUpgradeEnergyUsage = builder - .comment(tooltipTranslation("upgrade.silkTouchUpgradeEnergyUsage")) .translation(translationKey("upgrade.silkTouchUpgradeEnergyUsage")) .defineInRange("silkTouchUpgradeEnergyUsage", DefaultEnergyUsage.SILK_TOUCH_UPGRADE, 0, Long.MAX_VALUE); regulatorUpgradeEnergyUsage = builder - .comment(tooltipTranslation("upgrade.regulatorUpgradeEnergyUsage")) .translation(translationKey("upgrade.regulatorUpgradeEnergyUsage")) .defineInRange("regulatorUpgradeEnergyUsage", DefaultEnergyUsage.REGULATOR_UPGRADE, 0, Long.MAX_VALUE); rangeUpgradeEnergyUsage = builder - .comment(tooltipTranslation("upgrade.rangeUpgradeEnergyUsage")) .translation(translationKey("upgrade.rangeUpgradeEnergyUsage")) .defineInRange("rangeUpgradeEnergyUsage", DefaultEnergyUsage.RANGE_UPGRADE, 0, Long.MAX_VALUE); creativeRangeUpgradeEnergyUsage = builder - .comment(tooltipTranslation("upgrade.creativeRangeUpgradeEnergyUsage")) .translation(translationKey("upgrade.creativeRangeUpgradeEnergyUsage")) .defineInRange( "creativeRangeUpgradeEnergyUsage", @@ -729,7 +684,6 @@ private class UpgradeEntryImpl implements UpgradeEntry { Long.MAX_VALUE ); rangeUpgradeRange = builder - .comment(tooltipTranslation("upgrade.rangeUpgradeRange")) .translation(translationKey("upgrade.rangeUpgradeRange")) .defineInRange("rangeUpgradeRange", DefaultEnergyUsage.RANGE_UPGRADE_RANGE, 0, Integer.MAX_VALUE); builder.pop(); @@ -795,19 +749,15 @@ private class WirelessGridEntryImpl implements WirelessGridEntry { WirelessGridEntryImpl() { builder.translation(translationKey("wirelessGrid")).push("wirelessGrid"); energyCapacity = builder - .comment(tooltipTranslation("wirelessGrid." + ENERGY_CAPACITY)) .translation(translationKey("wirelessGrid." + ENERGY_CAPACITY)) .defineInRange(ENERGY_CAPACITY, DefaultEnergyUsage.WIRELESS_GRID_CAPACITY, 0, Long.MAX_VALUE); openEnergyUsage = builder - .comment(tooltipTranslation("wirelessGrid.openEnergyUsage")) .translation(translationKey("wirelessGrid.openEnergyUsage")) .defineInRange("openEnergyUsage", DefaultEnergyUsage.WIRELESS_GRID_OPEN, 0, Long.MAX_VALUE); extractEnergyUsage = builder - .comment(tooltipTranslation("wirelessGrid.extractEnergyUsage")) .translation(translationKey("wirelessGrid.extractEnergyUsage")) .defineInRange("extractEnergyUsage", DefaultEnergyUsage.WIRELESS_GRID_EXTRACT, 0, Long.MAX_VALUE); insertEnergyUsage = builder - .comment(tooltipTranslation("wirelessGrid.insertEnergyUsage")) .translation(translationKey("wirelessGrid.insertEnergyUsage")) .defineInRange("insertEnergyUsage", DefaultEnergyUsage.WIRELESS_GRID_INSERT, 0, Long.MAX_VALUE); builder.pop(); @@ -837,11 +787,9 @@ private class WirelessTransmitterEntryImpl implements WirelessTransmitterEntry { WirelessTransmitterEntryImpl() { builder.translation(translationKey("wirelessTransmitter")).push("wirelessTransmitter"); energyUsage = builder - .comment(tooltipTranslation("wirelessTransmitter." + ENERGY_USAGE)) .translation(translationKey("wirelessTransmitter." + ENERGY_USAGE)) .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.WIRELESS_TRANSMITTER, 0, Long.MAX_VALUE); baseRange = builder - .comment(tooltipTranslation("wirelessTransmitter.baseRange")) .translation(translationKey("wirelessTransmitter.baseRange")) .defineInRange("baseRange", DefaultEnergyUsage.WIRELESS_TRANSMITTER_BASE_RANGE, 0, Integer.MAX_VALUE); builder.pop(); @@ -865,19 +813,15 @@ private class PortableGridEntryImpl implements PortableGridEntry { PortableGridEntryImpl() { builder.translation(translationKey("portableGrid")).push("portableGrid"); energyCapacity = builder - .comment(tooltipTranslation("portableGrid." + ENERGY_CAPACITY)) .translation(translationKey("portableGrid." + ENERGY_CAPACITY)) .defineInRange(ENERGY_CAPACITY, DefaultEnergyUsage.PORTABLE_GRID_CAPACITY, 0, Long.MAX_VALUE); openEnergyUsage = builder - .comment(tooltipTranslation("portableGrid.openEnergyUsage")) .translation(translationKey("portableGrid.openEnergyUsage")) .defineInRange("openEnergyUsage", DefaultEnergyUsage.PORTABLE_GRID_OPEN, 0, Long.MAX_VALUE); extractEnergyUsage = builder - .comment(tooltipTranslation("portableGrid.extractEnergyUsage")) .translation(translationKey("portableGrid.extractEnergyUsage")) .defineInRange("extractEnergyUsage", DefaultEnergyUsage.PORTABLE_GRID_EXTRACT, 0, Long.MAX_VALUE); insertEnergyUsage = builder - .comment(tooltipTranslation("portableGrid.insertEnergyUsage")) .translation(translationKey("portableGrid.insertEnergyUsage")) .defineInRange("insertEnergyUsage", DefaultEnergyUsage.PORTABLE_GRID_INSERT, 0, Long.MAX_VALUE); builder.pop(); @@ -907,11 +851,9 @@ private class RelayEntryImpl implements RelayEntry { RelayEntryImpl() { builder.translation(translationKey("relay")).push("relay"); inputNetworkEnergyUsage = builder - .comment(tooltipTranslation("relay.inputNetworkEnergyUsage")) .translation(translationKey("relay.inputNetworkEnergyUsage")) .defineInRange("inputNetworkEnergyUsage", DefaultEnergyUsage.RELAY_INPUT_NETWORK, 8, Long.MAX_VALUE); outputNetworkEnergyUsage = builder - .comment(tooltipTranslation("relay.outputNetworkEnergyUsage")) .translation(translationKey("relay.outputNetworkEnergyUsage")) .defineInRange("outputNetworkEnergyUsage", DefaultEnergyUsage.RELAY_OUTPUT_NETWORK, 8, Long.MAX_VALUE); builder.pop(); From 406f5a4bc5a469117a4abcf7797afaab5ed9bf2c Mon Sep 17 00:00:00 2001 From: Raoul Date: Sun, 21 Jul 2024 01:31:57 +0200 Subject: [PATCH 12/36] chore: update translation French from crowdin --- .../assets/refinedstorage/lang/fr_fr.json | 150 ++++++++++++++---- 1 file changed, 123 insertions(+), 27 deletions(-) diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/fr_fr.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/fr_fr.json index ec151d4b7..7f499f6a0 100644 --- a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/fr_fr.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/fr_fr.json @@ -2,7 +2,7 @@ "mod.refinedstorage": "Refined Storage", "block.refinedstorage.cable": "Câble", "block.refinedstorage.quartz_enriched_iron_block": "Bloc de Fer Enrichi en Quartz", - "block.refinedstorage.quartz_enriched_copper_block": "Block of Quartz Enriched Copper", + "block.refinedstorage.quartz_enriched_copper_block": "Bloc de Cuivre enrichi en Quartz", "block.refinedstorage.disk_drive": "Lecteur de Disque", "block.refinedstorage.machine_casing": "Boitier de Machine", "block.refinedstorage.grid": "Grille", @@ -34,8 +34,8 @@ "block.refinedstorage.creative_portable_grid": "Grille portable créative", "block.refinedstorage.security_manager": "Poste de sécurité", "block.refinedstorage.security_manager.help": "Lorsque ce périphérique est actif, il protège le réseau par défaut et bloque toutes les opérations. Commencez à ajouter des Cartes de Sécurité pour permettre ou refuser des opérations spécifiques pour un joueur.", - "block.refinedstorage.relay": "Relay", - "block.refinedstorage.disk_interface": "Disk Interface", + "block.refinedstorage.relay": "Relais", + "block.refinedstorage.disk_interface": "Interface Disque", "gui.refinedstorage.controller.redstone_mode_help": "Lorsque ce périphérique est inactif, le réseau de stockage ne peut pas utiliser ce périphérique comme source d'énergie.", "gui.refinedstorage.disk_drive.disks": "Disques", "gui.refinedstorage.storage.redstone_mode_help": "Lorsque ce périphérique est inactif, le stockage contenu ne sera plus accessible depuis le réseau de stockage.", @@ -109,14 +109,14 @@ "gui.refinedstorage.filter_mode.block": "Liste noire", "gui.refinedstorage.fuzzy_mode": "Mode flou", "gui.refinedstorage.fuzzy_mode.on": "Activé", - "gui.refinedstorage.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", - "gui.refinedstorage.fuzzy_mode.on.generic_help": "Match the filter exactly.", - "gui.refinedstorage.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", - "gui.refinedstorage.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", + "gui.refinedstorage.fuzzy_mode.on.storage_help": "Faire correspondre exactement les filtres pour la liste d'autorisation ou de blocage.", + "gui.refinedstorage.fuzzy_mode.on.generic_help": "Faire correspondre exactement le filtre.", + "gui.refinedstorage.fuzzy_mode.on.extracting_storage_network_help": "Faire correspondre exactement les filtres du réseau de stockage.", + "gui.refinedstorage.fuzzy_mode.on.extracting_source_help": "Faire correspondre exactement les filtres lors de l'extraction depuis la source.", "gui.refinedstorage.fuzzy_mode.off": "Désactivé", - "gui.refinedstorage.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", - "gui.refinedstorage.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", - "gui.refinedstorage.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.storage_help": "Faire correspondre exactement les filtres pour la liste d'autorisation ou de blocage sans comparer les tags NBT.", + "gui.refinedstorage.fuzzy_mode.off.generic_help": "Faire correspondre le filtre sans comparer les tags NBT.", + "gui.refinedstorage.fuzzy_mode.off.extracting_storage_network_help": "Faire correspondre les filtres lors de l'extraction depuis le réseau de stockage sans comparer les tags NBT.", "gui.refinedstorage.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", "gui.refinedstorage.access_mode": "Mode d'accès", "gui.refinedstorage.access_mode.insert_extract": "Insertion et extraction", @@ -209,16 +209,16 @@ "item.refinedstorage.256b_fluid_storage_disk": "Disque de stockage de fluides 256B", "item.refinedstorage.1024b_fluid_storage_disk": "Disque de stockage de fluides 1024B", "item.refinedstorage.4096b_fluid_storage_disk": "Disque de stockage de fluides 4096B", - "item.refinedstorage.fluid_storage_disk.help": "Stores %s buckets.", - "item.refinedstorage.fluid_storage_block.help": "Stores %s buckets.", + "item.refinedstorage.fluid_storage_disk.help": "Stocke %s seaux.", + "item.refinedstorage.fluid_storage_block.help": "Stockes %s seaux.", "item.refinedstorage.creative_fluid_storage_disk": "Disque de stockage de fluides créatif", - "item.refinedstorage.creative_fluid_storage_disk.help": "Stores an infinite amount of buckets.", - "item.refinedstorage.creative_fluid_storage_block.help": "Stores an infinite amount of buckets.", + "item.refinedstorage.creative_fluid_storage_disk.help": "Stocke une quantité infinie de seaux.", + "item.refinedstorage.creative_fluid_storage_block.help": "Stocke une quantité infinie de seaux.", "item.refinedstorage.storage_housing": "Boitier de stockage", "item.refinedstorage.construction_core": "Cœur de construction", "item.refinedstorage.destruction_core": "Cœur de destruction", "item.refinedstorage.wrench": "Clé", - "item.refinedstorage.wrench.help": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", + "item.refinedstorage.wrench.help": "Utiliser afin de tourner des blocs ou appuyer sur SHIFT et utiliser afin de démonter des blocs Refined Storage.", "item.refinedstorage.upgrade": "Amélioration", "item.refinedstorage.speed_upgrade": "Amélioration de vitesse", "item.refinedstorage.speed_upgrade.help": "Increases the operation speed of a storage network device.", @@ -302,6 +302,7 @@ "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Vider la matrice d'artisanat dans le réseau", "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Vider la matrice d'artisanat dans l'inventaire", "key.refinedstorage.open_wireless_grid": "Ouvrir la grille sans fil", + "key.refinedstorage.open_portable_grid": "Open Portable Grid", "refinedstorage.subtitle.wrench": "Clé utilisée", "permission.refinedstorage.insert": "Insérer", "permission.refinedstorage.insert.description": "Si le joueur peut insérer des ressources dans le réseau.", @@ -334,111 +335,206 @@ "tag.item.refinedstorage.storage_disks": "Storage Disks", "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.title": "Refined Storage Configuration", + "refinedstorage.configuration.title": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml.title": "Refined Storage Configuration", "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.smoothScrolling.tooltip": "Whether scrollbars should use smooth scrolling.", "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.screenSize.tooltip": "The screen size.", "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.maxRowsStretch.tooltip": "The maximum amount of rows that can be displayed when the screen size is stretched.", "text.autoconfig.refinedstorage.option.grid": "Grille", + "text.autoconfig.refinedstorage.option.grid.tooltip": "Configuration for the Grid.", "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.largeFont.tooltip": "Whether the Grid should use a large font for quantities.", "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Empêcher le tri lorsque la touche Maj est enfoncée", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown.tooltip": "Whether the Grid should avoid sorting when shift is held down.", "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip.tooltip": "Whether the Grid should show a detailed tooltip.", "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery.tooltip": "Whether the search query should persist when closing and re-opening the Grid.", "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.energyUsage.tooltip": "The energy used by the Grid.", "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.autoSelected.tooltip": "Whether the search box should be auto-selected when opening the Grid.", "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronisation", - "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.synchronizer.tooltip": "The synchronization type of the Grid search box.", + "text.autoconfig.refinedstorage.option.grid.resourceType": "Resource type", + "text.autoconfig.refinedstorage.option.grid.resourceType.tooltip": "The resource type to be shown.", "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Direction du tri", + "text.autoconfig.refinedstorage.option.grid.sortingDirection.tooltip": "The sorting direction.", "text.autoconfig.refinedstorage.option.grid.sortingType": "Type de tri", + "text.autoconfig.refinedstorage.option.grid.sortingType.tooltip": "The sorting type.", "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.tooltip": "Configuration for the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage.tooltip": "The energy used by the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior.tooltip": "What should happen to the crafting matrix slots when closing the Crafting Grid.", "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.tooltip": "Configuration for the Controller.", "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.controller.energyCapacity.tooltip": "The energy capacity of the Controller.", "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.tooltip": "Configuration for the Cable.", "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.cable.energyUsage.tooltip": "The energy used by the Cable.", "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.tooltip": "Configuration for the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage.tooltip": "The energy used by the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.tooltip": "Configuration for the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage.tooltip": "The energy used by the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.tooltip": "Configuration for the Storage Blocks.", "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage.tooltip": "The energy used by the 1K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage.tooltip": "The energy used by the 4K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage.tooltip": "The energy used by the 16K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage.tooltip": "The energy used by the 64K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.tooltip": "Configuration for the Fluid Storage Blocks.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage.tooltip": "The energy used by the 64B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage.tooltip": "The energy used by the 256B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage.tooltip": "The energy used by the 1024B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage.tooltip": "The energy used by the 4096B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Fluid Storage Block.", "text.autoconfig.refinedstorage.option.importer": "Importateur", + "text.autoconfig.refinedstorage.option.importer.tooltip": "Configuration for the Importer.", "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.importer.energyUsage.tooltip": "The energy used by the Importer.", "text.autoconfig.refinedstorage.option.exporter": "Exportateur", + "text.autoconfig.refinedstorage.option.exporter.tooltip": "Configuration for the Exporter.", "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter.energyUsage.tooltip": "The energy used by the Exporter.", "text.autoconfig.refinedstorage.option.detector": "Détecteur", + "text.autoconfig.refinedstorage.option.detector.tooltip": "Configuration for the Detector.", "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector.energyUsage.tooltip": "The energy used by the Detector.", "text.autoconfig.refinedstorage.option.constructor": "Constructeur", + "text.autoconfig.refinedstorage.option.constructor.tooltip": "Configuration for the Constructor.", "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor.energyUsage.tooltip": "The energy used by the Constructor.", "text.autoconfig.refinedstorage.option.destructor": "Destructeur", + "text.autoconfig.refinedstorage.option.destructor.tooltip": "Configuration for the Destructor.", "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor.energyUsage.tooltip": "The energy used by the Destructor.", "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.tooltip": "Configuration for the Upgrades.", "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage.tooltip": "The additional energy used per Speed Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage.tooltip": "The additional energy used by the Stack Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 1 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 2 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 3 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage.tooltip": "The additional energy used by the Silk Touch Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage.tooltip": "The additional energy used by the Regulator Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage.tooltip": "The additional energy used per Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage.tooltip": "The additional energy used by the Creative Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange.tooltip": "The additional range provided by the Range Upgrade.", "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.tooltip": "Configuration for the Interface.", "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.iface.energyUsage.tooltip": "The energy used by the Interface.", "text.autoconfig.refinedstorage.option.externalStorage": "Stockage Externe", + "text.autoconfig.refinedstorage.option.externalStorage.tooltip": "Configuration for the External Storage.", "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage.tooltip": "The energy used by the External Storage.", "text.autoconfig.refinedstorage.option.wirelessGrid": "Grille sans fil", + "text.autoconfig.refinedstorage.option.wirelessGrid.tooltip": "Configuration for the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Capacité énergétique", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity.tooltip": "The energy capacity of the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage.tooltip": "The energy used by the Wireless Grid to open.", "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage.tooltip": "The energy used by the Wireless Grid to insert resources.", "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage.tooltip": "The energy used by the Wireless Grid to extract resources.", "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Émetteur sans fil", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.tooltip": "Configuration for the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage.tooltip": "The energy used by the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Portée de base", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange.tooltip": "The base range of the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.storageMonitor": "Moniteur de Stockage", + "text.autoconfig.refinedstorage.option.storageMonitor.tooltip": "Configuration for the Storage Monitor.", "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage.tooltip": "The energy used by the Storage Monitor.", "text.autoconfig.refinedstorage.option.networkReceiver": "Récepteur Réseau", + "text.autoconfig.refinedstorage.option.networkReceiver.tooltip": "Configuration for the Network Receiver.", "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage.tooltip": "The energy used by the Network Receiver.", "text.autoconfig.refinedstorage.option.networkTransmitter": "Transmetteur Réseau", + "text.autoconfig.refinedstorage.option.networkTransmitter.tooltip": "Configuration for the Network Transmitter.", "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage.tooltip": "The energy used by the Network Transmitter.", "text.autoconfig.refinedstorage.option.portableGrid": "Grille portable", + "text.autoconfig.refinedstorage.option.portableGrid.tooltip": "Configuration for the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity.tooltip": "The energy capacity of the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage.tooltip": "The energy used by the Portable Grid to open.", "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage.tooltip": "The energy used by the Portable Grid to insert resources.", "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage.tooltip": "The energy used by the Portable Grid to extract resources.", "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.tooltip": "Configuration for the Security Card.", "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage.tooltip": "The energy used by the Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.tooltip": "Configuration for the Fallback Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage.tooltip": "The energy used by the Fallback Security Card.", "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.tooltip": "Configuration for the Security Manager.", "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage.tooltip": "The energy used by the Security Manager.", "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.tooltip": "Configuration for the Relay.", "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage.tooltip": "Input network energy usage.", "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage.tooltip": "Output network energy usage (if not in pass through mode).", "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", - "advancements.refinedstorage.connecting": "Connecting", + "advancements.refinedstorage.connecting": "Connexion en cours", "advancements.refinedstorage.connecting.description": "Utiliser un câble pour connecter pour connecter des périphériques ensembles, ou placer les périphériques l'un contre l'autre", - "advancements.refinedstorage.drives": "Drives", - "advancements.refinedstorage.drives.description": "Craft a Disk Drive to be able to store your storage disks", - "advancements.refinedstorage.interfacing_with_disks": "Interfacing with disks", - "advancements.refinedstorage.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", - "advancements.refinedstorage.storing_items": "Storing items", - "advancements.refinedstorage.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage.viewing_your_storage": "Viewing your storage", - "advancements.refinedstorage.viewing_your_storage.description": "Craft a Grid to interact with your storage", - "advancements.refinedstorage.upgrading_your_grid": "Upgrading your Grid", + "advancements.refinedstorage.drives": "Disques", + "advancements.refinedstorage.drives.description": "Craftez un lecteur de disques afin de stocker vos disques de stockage", + "advancements.refinedstorage.interfacing_with_disks": "Interfacer avec des disques", + "advancements.refinedstorage.interfacing_with_disks.description": "Craftez une interface disque afin de transférer des ressources entre le réseau de stockage et les disques de stockage", + "advancements.refinedstorage.storing_items": "Stocker des items", + "advancements.refinedstorage.storing_items.description": "Craftez un disque de stockage et mettez-le dans votre lecteur de disque", + "advancements.refinedstorage.viewing_your_storage": "Visualiser votre stockage", + "advancements.refinedstorage.viewing_your_storage.description": "Craftez une grille pour interagir avec votre stockage", + "advancements.refinedstorage.upgrading_your_grid": "Ameliorer votre grille", "advancements.refinedstorage.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", "advancements.refinedstorage.storing_fluids": "Storing fluids", "advancements.refinedstorage.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", From 1ebca57539a07b332d1c0ba7e231becb22e77a54 Mon Sep 17 00:00:00 2001 From: Raoul Date: Sun, 21 Jul 2024 01:31:58 +0200 Subject: [PATCH 13/36] chore: update translation Spanish from crowdin --- .../assets/refinedstorage/lang/es_es.json | 100 +++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/es_es.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/es_es.json index ec4bbf34f..7b07c2b4f 100644 --- a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/es_es.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/es_es.json @@ -302,6 +302,7 @@ "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", + "key.refinedstorage.open_portable_grid": "Open Portable Grid", "refinedstorage.subtitle.wrench": "Llave Inglesa usada", "permission.refinedstorage.insert": "Insertar", "permission.refinedstorage.insert.description": "Si el jugador puede insertar recursos en una red.", @@ -334,99 +335,194 @@ "tag.item.refinedstorage.storage_disks": "Storage Disks", "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.title": "Refined Storage Configuration", + "refinedstorage.configuration.title": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml.title": "Refined Storage Configuration", "text.autoconfig.refinedstorage.option.smoothScrolling": "Desplazamiento suave", + "text.autoconfig.refinedstorage.option.smoothScrolling.tooltip": "Whether scrollbars should use smooth scrolling.", "text.autoconfig.refinedstorage.option.screenSize": "Tamaño de pantalla", + "text.autoconfig.refinedstorage.option.screenSize.tooltip": "The screen size.", "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.maxRowsStretch.tooltip": "The maximum amount of rows that can be displayed when the screen size is stretched.", "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.tooltip": "Configuration for the Grid.", "text.autoconfig.refinedstorage.option.grid.largeFont": "Fuente grande", + "text.autoconfig.refinedstorage.option.grid.largeFont.tooltip": "Whether the Grid should use a large font for quantities.", "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Evitar ordenar mientras SHIFT está presionado", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown.tooltip": "Whether the Grid should avoid sorting when shift is held down.", "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Descripción detallada", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip.tooltip": "Whether the Grid should show a detailed tooltip.", "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Recordar búsqueda", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery.tooltip": "Whether the search query should persist when closing and re-opening the Grid.", "text.autoconfig.refinedstorage.option.grid.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.grid.energyUsage.tooltip": "The energy used by the Grid.", "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.autoSelected.tooltip": "Whether the search box should be auto-selected when opening the Grid.", "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Tipo de Recurso", + "text.autoconfig.refinedstorage.option.grid.synchronizer.tooltip": "The synchronization type of the Grid search box.", + "text.autoconfig.refinedstorage.option.grid.resourceType": "Resource type", + "text.autoconfig.refinedstorage.option.grid.resourceType.tooltip": "The resource type to be shown.", "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Dirección de ordenación", + "text.autoconfig.refinedstorage.option.grid.sortingDirection.tooltip": "The sorting direction.", "text.autoconfig.refinedstorage.option.grid.sortingType": "Tipo de ordenación", + "text.autoconfig.refinedstorage.option.grid.sortingType.tooltip": "The sorting type.", "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.tooltip": "Configuration for the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage.tooltip": "The energy used by the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior.tooltip": "What should happen to the crafting matrix slots when closing the Crafting Grid.", "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.tooltip": "Configuration for the Controller.", "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.controller.energyCapacity.tooltip": "The energy capacity of the Controller.", "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.tooltip": "Configuration for the Cable.", "text.autoconfig.refinedstorage.option.cable.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.cable.energyUsage.tooltip": "The energy used by the Cable.", "text.autoconfig.refinedstorage.option.diskDrive": "Disco Duro", + "text.autoconfig.refinedstorage.option.diskDrive.tooltip": "Configuration for the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage.tooltip": "The energy used by the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Uso de energía por disco", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.tooltip": "Configuration for the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage.tooltip": "The energy used by the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.storageBlock": "Bloque de almacenamiento", + "text.autoconfig.refinedstorage.option.storageBlock.tooltip": "Configuration for the Storage Blocks.", "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K de consumo de energía", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage.tooltip": "The energy used by the 1K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K de consumo de energía", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage.tooltip": "The energy used by the 4K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K de consumo de energía", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage.tooltip": "The energy used by the 16K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K de consumo de energía", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage.tooltip": "The energy used by the 64K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Consumo de energía creativo", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.tooltip": "Configuration for the Fluid Storage Blocks.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage.tooltip": "The energy used by the 64B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage.tooltip": "The energy used by the 256B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage.tooltip": "The energy used by the 1024B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage.tooltip": "The energy used by the 4096B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Fluid Storage Block.", "text.autoconfig.refinedstorage.option.importer": "Importador", + "text.autoconfig.refinedstorage.option.importer.tooltip": "Configuration for the Importer.", "text.autoconfig.refinedstorage.option.importer.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.importer.energyUsage.tooltip": "The energy used by the Importer.", "text.autoconfig.refinedstorage.option.exporter": "Exportador", + "text.autoconfig.refinedstorage.option.exporter.tooltip": "Configuration for the Exporter.", "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.exporter.energyUsage.tooltip": "The energy used by the Exporter.", "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.tooltip": "Configuration for the Detector.", "text.autoconfig.refinedstorage.option.detector.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.detector.energyUsage.tooltip": "The energy used by the Detector.", "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.tooltip": "Configuration for the Constructor.", "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.constructor.energyUsage.tooltip": "The energy used by the Constructor.", "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.tooltip": "Configuration for the Destructor.", "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.destructor.energyUsage.tooltip": "The energy used by the Destructor.", "text.autoconfig.refinedstorage.option.upgrade": "Mejora", + "text.autoconfig.refinedstorage.option.upgrade.tooltip": "Configuration for the Upgrades.", "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage.tooltip": "The additional energy used per Speed Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage.tooltip": "The additional energy used by the Stack Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 1 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 2 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 3 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage.tooltip": "The additional energy used by the Silk Touch Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage.tooltip": "The additional energy used by the Regulator Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage.tooltip": "The additional energy used per Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage.tooltip": "The additional energy used by the Creative Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Rango de mejora de rango", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange.tooltip": "The additional range provided by the Range Upgrade.", "text.autoconfig.refinedstorage.option.iface": "Interfaz", + "text.autoconfig.refinedstorage.option.iface.tooltip": "Configuration for the Interface.", "text.autoconfig.refinedstorage.option.iface.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.iface.energyUsage.tooltip": "The energy used by the Interface.", "text.autoconfig.refinedstorage.option.externalStorage": "Almacenamiento Externo", + "text.autoconfig.refinedstorage.option.externalStorage.tooltip": "Configuration for the External Storage.", "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage.tooltip": "The energy used by the External Storage.", "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.tooltip": "Configuration for the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity.tooltip": "The energy capacity of the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage.tooltip": "The energy used by the Wireless Grid to open.", "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage.tooltip": "The energy used by the Wireless Grid to insert resources.", "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage.tooltip": "The energy used by the Wireless Grid to extract resources.", "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.tooltip": "Configuration for the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage.tooltip": "The energy used by the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange.tooltip": "The base range of the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.tooltip": "Configuration for the Storage Monitor.", "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage.tooltip": "The energy used by the Storage Monitor.", "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.tooltip": "Configuration for the Network Receiver.", "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage.tooltip": "The energy used by the Network Receiver.", "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.tooltip": "Configuration for the Network Transmitter.", "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage.tooltip": "The energy used by the Network Transmitter.", "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.tooltip": "Configuration for the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity.tooltip": "The energy capacity of the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage.tooltip": "The energy used by the Portable Grid to open.", "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage.tooltip": "The energy used by the Portable Grid to insert resources.", "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Consumo de energía al extraer", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage.tooltip": "The energy used by the Portable Grid to extract resources.", "text.autoconfig.refinedstorage.option.securityCard": "Tarjeta de Seguridad", + "text.autoconfig.refinedstorage.option.securityCard.tooltip": "Configuration for the Security Card.", "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage.tooltip": "The energy used by the Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.tooltip": "Configuration for the Fallback Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage.tooltip": "The energy used by the Fallback Security Card.", "text.autoconfig.refinedstorage.option.securityManager": "Gestor de seguridad", + "text.autoconfig.refinedstorage.option.securityManager.tooltip": "Configuration for the Security Manager.", "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage.tooltip": "The energy used by the Security Manager.", "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.tooltip": "Configuration for the Relay.", "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage.tooltip": "Input network energy usage.", "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage.tooltip": "Output network energy usage (if not in pass through mode).", "advancements.refinedstorage.root.description": "Utilice uno o varios controladores en una red de almacenamiento para proporcionar energía a su red", "advancements.refinedstorage.connecting": "Conectando", "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", From 030cbbd32257820129a276db8efd838a957f48ae Mon Sep 17 00:00:00 2001 From: Raoul Date: Sun, 21 Jul 2024 01:31:59 +0200 Subject: [PATCH 14/36] chore: update translation German from crowdin --- .../assets/refinedstorage/lang/de_de.json | 100 +++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/de_de.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/de_de.json index 19fc66425..b86cf97e8 100644 --- a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/de_de.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/de_de.json @@ -302,6 +302,7 @@ "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Werkbank in der Konsole zum Netzwerk leeren", "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Werkbank in der Konsole zum Inventar leeren", "key.refinedstorage.open_wireless_grid": "Drahtlose Konsole öffnen", + "key.refinedstorage.open_portable_grid": "Open Portable Grid", "refinedstorage.subtitle.wrench": "Schraubenschlüssel benutzt", "permission.refinedstorage.insert": "Einfügen", "permission.refinedstorage.insert.description": "Gibt an, ob der Spieler Ressourcen in ein Netzwerk einfügen kann.", @@ -334,99 +335,194 @@ "tag.item.refinedstorage.storage_disks": "Storage Disks", "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.title": "Refined Storage Configuration", + "refinedstorage.configuration.title": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml.title": "Refined Storage Configuration", "text.autoconfig.refinedstorage.option.smoothScrolling": "Flüssiges Scrollen", + "text.autoconfig.refinedstorage.option.smoothScrolling.tooltip": "Whether scrollbars should use smooth scrolling.", "text.autoconfig.refinedstorage.option.screenSize": "Bildschirmgröße", + "text.autoconfig.refinedstorage.option.screenSize.tooltip": "The screen size.", "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximale Anzahl von Zeilen, wenn Bildschirmgröße gestreckt ist", + "text.autoconfig.refinedstorage.option.maxRowsStretch.tooltip": "The maximum amount of rows that can be displayed when the screen size is stretched.", "text.autoconfig.refinedstorage.option.grid": "Konsole", + "text.autoconfig.refinedstorage.option.grid.tooltip": "Configuration for the Grid.", "text.autoconfig.refinedstorage.option.grid.largeFont": "Große Schriftart", + "text.autoconfig.refinedstorage.option.grid.largeFont.tooltip": "Whether the Grid should use a large font for quantities.", "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Sortierung verhindern während SHIFT gedrückt ist", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown.tooltip": "Whether the Grid should avoid sorting when shift is held down.", "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detaillierte Kurzinfo", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip.tooltip": "Whether the Grid should show a detailed tooltip.", "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Suchabfrage merken", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery.tooltip": "Whether the search query should persist when closing and re-opening the Grid.", "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.grid.energyUsage.tooltip": "The energy used by the Grid.", "text.autoconfig.refinedstorage.option.grid.autoSelected": "Autoselektieres Suchfeld", + "text.autoconfig.refinedstorage.option.grid.autoSelected.tooltip": "Whether the search box should be auto-selected when opening the Grid.", "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronisator", - "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Ressourcentyp", + "text.autoconfig.refinedstorage.option.grid.synchronizer.tooltip": "The synchronization type of the Grid search box.", + "text.autoconfig.refinedstorage.option.grid.resourceType": "Resource type", + "text.autoconfig.refinedstorage.option.grid.resourceType.tooltip": "The resource type to be shown.", "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sortierrichtung", + "text.autoconfig.refinedstorage.option.grid.sortingDirection.tooltip": "The sorting direction.", "text.autoconfig.refinedstorage.option.grid.sortingType": "Sortierart", + "text.autoconfig.refinedstorage.option.grid.sortingType.tooltip": "The sorting type.", "text.autoconfig.refinedstorage.option.craftingGrid": "Herstellungskonsole", + "text.autoconfig.refinedstorage.option.craftingGrid.tooltip": "Configuration for the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage.tooltip": "The energy used by the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Werkbank Schließverhalten", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior.tooltip": "What should happen to the crafting matrix slots when closing the Crafting Grid.", "text.autoconfig.refinedstorage.option.controller": "Kontrollblock", + "text.autoconfig.refinedstorage.option.controller.tooltip": "Configuration for the Controller.", "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energiekapazität", + "text.autoconfig.refinedstorage.option.controller.energyCapacity.tooltip": "The energy capacity of the Controller.", "text.autoconfig.refinedstorage.option.cable": "Kabel", + "text.autoconfig.refinedstorage.option.cable.tooltip": "Configuration for the Cable.", "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.cable.energyUsage.tooltip": "The energy used by the Cable.", "text.autoconfig.refinedstorage.option.diskDrive": "Laufwerk", + "text.autoconfig.refinedstorage.option.diskDrive.tooltip": "Configuration for the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage.tooltip": "The energy used by the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energieverbrauch pro Festplatte", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.tooltip": "Configuration for the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage.tooltip": "The energy used by the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.storageBlock": "Speicherblock", + "text.autoconfig.refinedstorage.option.storageBlock.tooltip": "Configuration for the Storage Blocks.", "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1k Energieverbrauch", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage.tooltip": "The energy used by the 1K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4k Energieverbrauch", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage.tooltip": "The energy used by the 4K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16k Energieverbrauch", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage.tooltip": "The energy used by the 16K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64k Energieverbrauch", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage.tooltip": "The energy used by the 64K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Kreativer Energieverbrauch", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Flüssigspeicherblock", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.tooltip": "Configuration for the Fluid Storage Blocks.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B Energieverbrauch", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage.tooltip": "The energy used by the 64B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B Energieverbrauch", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage.tooltip": "The energy used by the 256B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B Energieverbrauch", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage.tooltip": "The energy used by the 1024B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B Energieverbrauch", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage.tooltip": "The energy used by the 4096B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Kreativer Energieverbrauch", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Fluid Storage Block.", "text.autoconfig.refinedstorage.option.importer": "Importierer", + "text.autoconfig.refinedstorage.option.importer.tooltip": "Configuration for the Importer.", "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.importer.energyUsage.tooltip": "The energy used by the Importer.", "text.autoconfig.refinedstorage.option.exporter": "Exportierer", + "text.autoconfig.refinedstorage.option.exporter.tooltip": "Configuration for the Exporter.", "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.exporter.energyUsage.tooltip": "The energy used by the Exporter.", "text.autoconfig.refinedstorage.option.detector": "Detektor", + "text.autoconfig.refinedstorage.option.detector.tooltip": "Configuration for the Detector.", "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.detector.energyUsage.tooltip": "The energy used by the Detector.", "text.autoconfig.refinedstorage.option.constructor": "Konstruktor", + "text.autoconfig.refinedstorage.option.constructor.tooltip": "Configuration for the Constructor.", "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.constructor.energyUsage.tooltip": "The energy used by the Constructor.", "text.autoconfig.refinedstorage.option.destructor": "Destruktor", + "text.autoconfig.refinedstorage.option.destructor.tooltip": "Configuration for the Destructor.", "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.destructor.energyUsage.tooltip": "The energy used by the Destructor.", "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.tooltip": "Configuration for the Upgrades.", "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Energieverbrauch von Geschwindigkeitsupgrade", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage.tooltip": "The additional energy used per Speed Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Energieverbrauch vom Stapelupgrade", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage.tooltip": "The additional energy used by the Stack Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Energieverbrauch vom Glück 1 Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 1 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Energieverbrauch vom Glück 2 Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 2 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Energieverbrauch vom Glück 3 Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 3 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Energieverbrauch vom Behutsamkeitsupgrade", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage.tooltip": "The additional energy used by the Silk Touch Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Energieverbrauch vom Regulator Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage.tooltip": "The additional energy used by the Regulator Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Energieverbrauch vom Reichweitenupgrade", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage.tooltip": "The additional energy used per Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Energieverbrauch vom Kreativen Reichweitenupgrade", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage.tooltip": "The additional energy used by the Creative Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Reichweite vom Reichweitenupgrade", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange.tooltip": "The additional range provided by the Range Upgrade.", "text.autoconfig.refinedstorage.option.iface": "Schnittstelle", + "text.autoconfig.refinedstorage.option.iface.tooltip": "Configuration for the Interface.", "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.iface.energyUsage.tooltip": "The energy used by the Interface.", "text.autoconfig.refinedstorage.option.externalStorage": "Externer Speicher", + "text.autoconfig.refinedstorage.option.externalStorage.tooltip": "Configuration for the External Storage.", "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage.tooltip": "The energy used by the External Storage.", "text.autoconfig.refinedstorage.option.wirelessGrid": "Drahtlose Konsole", + "text.autoconfig.refinedstorage.option.wirelessGrid.tooltip": "Configuration for the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energiekapazität", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity.tooltip": "The energy capacity of the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Energieverbrauch beim Öffnen", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage.tooltip": "The energy used by the Wireless Grid to open.", "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Energieverbrauch beim Importieren", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage.tooltip": "The energy used by the Wireless Grid to insert resources.", "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Energieverbrauch beim Exportieren", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage.tooltip": "The energy used by the Wireless Grid to extract resources.", "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Funksender", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.tooltip": "Configuration for the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage.tooltip": "The energy used by the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Basisreichweite", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange.tooltip": "The base range of the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.storageMonitor": "Speichermonitor", + "text.autoconfig.refinedstorage.option.storageMonitor.tooltip": "Configuration for the Storage Monitor.", "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage.tooltip": "The energy used by the Storage Monitor.", "text.autoconfig.refinedstorage.option.networkReceiver": "Netzwerkempfänger", + "text.autoconfig.refinedstorage.option.networkReceiver.tooltip": "Configuration for the Network Receiver.", "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage.tooltip": "The energy used by the Network Receiver.", "text.autoconfig.refinedstorage.option.networkTransmitter": "Netzwerksender", + "text.autoconfig.refinedstorage.option.networkTransmitter.tooltip": "Configuration for the Network Transmitter.", "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage.tooltip": "The energy used by the Network Transmitter.", "text.autoconfig.refinedstorage.option.portableGrid": "Mobile Konsole", + "text.autoconfig.refinedstorage.option.portableGrid.tooltip": "Configuration for the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energiekapazität", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity.tooltip": "The energy capacity of the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Energieverbrauch beim Öffnen", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage.tooltip": "The energy used by the Portable Grid to open.", "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Energieverbrauch beim Importieren", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage.tooltip": "The energy used by the Portable Grid to insert resources.", "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Energieverbrauch beim Exportieren", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage.tooltip": "The energy used by the Portable Grid to extract resources.", "text.autoconfig.refinedstorage.option.securityCard": "Sicherheitskarte", + "text.autoconfig.refinedstorage.option.securityCard.tooltip": "Configuration for the Security Card.", "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage.tooltip": "The energy used by the Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Standard-Sicherheitskarte", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.tooltip": "Configuration for the Fallback Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage.tooltip": "The energy used by the Fallback Security Card.", "text.autoconfig.refinedstorage.option.securityManager": "Sicherheits-Manager", + "text.autoconfig.refinedstorage.option.securityManager.tooltip": "Configuration for the Security Manager.", "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage.tooltip": "The energy used by the Security Manager.", "text.autoconfig.refinedstorage.option.relay": "Relais", + "text.autoconfig.refinedstorage.option.relay.tooltip": "Configuration for the Relay.", "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Eingabenetzwerk Energienutzung", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage.tooltip": "Input network energy usage.", "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Ausgangsnetzwerk Energieverbrauch (wenn nicht im Durchlauf-Modus)", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage.tooltip": "Output network energy usage (if not in pass through mode).", "advancements.refinedstorage.root.description": "Nutzen Sie einen oder mehrere Kontrollblöcke in einem Speichernetzwerk, um das Netzwerk mit Energie zu versorgen", "advancements.refinedstorage.connecting": "Verbinden", "advancements.refinedstorage.connecting.description": "Benutze Kabel um Geräte miteinander zu verbinden, oder platziere Geräte nebeneinander", From 7294971d1f90b8f2a353349e23b139d95b30100a Mon Sep 17 00:00:00 2001 From: Raoul Date: Sun, 21 Jul 2024 01:32:00 +0200 Subject: [PATCH 15/36] chore: update translation Hungarian from crowdin --- .../assets/refinedstorage/lang/hu_hu.json | 100 +++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/hu_hu.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/hu_hu.json index f08f87e3b..adf9fc563 100644 --- a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/hu_hu.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/hu_hu.json @@ -302,6 +302,7 @@ "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", + "key.refinedstorage.open_portable_grid": "Open Portable Grid", "refinedstorage.subtitle.wrench": "Wrench used", "permission.refinedstorage.insert": "Insert", "permission.refinedstorage.insert.description": "Whether the player can insert resources in a network.", @@ -334,99 +335,194 @@ "tag.item.refinedstorage.storage_disks": "Storage Disks", "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.title": "Refined Storage Configuration", + "refinedstorage.configuration.title": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml.title": "Refined Storage Configuration", "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.smoothScrolling.tooltip": "Whether scrollbars should use smooth scrolling.", "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.screenSize.tooltip": "The screen size.", "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.maxRowsStretch.tooltip": "The maximum amount of rows that can be displayed when the screen size is stretched.", "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.tooltip": "Configuration for the Grid.", "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.largeFont.tooltip": "Whether the Grid should use a large font for quantities.", "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown.tooltip": "Whether the Grid should avoid sorting when shift is held down.", "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip.tooltip": "Whether the Grid should show a detailed tooltip.", "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery.tooltip": "Whether the search query should persist when closing and re-opening the Grid.", "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.energyUsage.tooltip": "The energy used by the Grid.", "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.autoSelected.tooltip": "Whether the search box should be auto-selected when opening the Grid.", "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.synchronizer.tooltip": "The synchronization type of the Grid search box.", + "text.autoconfig.refinedstorage.option.grid.resourceType": "Resource type", + "text.autoconfig.refinedstorage.option.grid.resourceType.tooltip": "The resource type to be shown.", "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sorting direction", + "text.autoconfig.refinedstorage.option.grid.sortingDirection.tooltip": "The sorting direction.", "text.autoconfig.refinedstorage.option.grid.sortingType": "Sorting type", + "text.autoconfig.refinedstorage.option.grid.sortingType.tooltip": "The sorting type.", "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.tooltip": "Configuration for the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage.tooltip": "The energy used by the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior.tooltip": "What should happen to the crafting matrix slots when closing the Crafting Grid.", "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.tooltip": "Configuration for the Controller.", "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.controller.energyCapacity.tooltip": "The energy capacity of the Controller.", "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.tooltip": "Configuration for the Cable.", "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.cable.energyUsage.tooltip": "The energy used by the Cable.", "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.tooltip": "Configuration for the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage.tooltip": "The energy used by the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.tooltip": "Configuration for the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage.tooltip": "The energy used by the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.tooltip": "Configuration for the Storage Blocks.", "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage.tooltip": "The energy used by the 1K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage.tooltip": "The energy used by the 4K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage.tooltip": "The energy used by the 16K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage.tooltip": "The energy used by the 64K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.tooltip": "Configuration for the Fluid Storage Blocks.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage.tooltip": "The energy used by the 64B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage.tooltip": "The energy used by the 256B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage.tooltip": "The energy used by the 1024B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage.tooltip": "The energy used by the 4096B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Fluid Storage Block.", "text.autoconfig.refinedstorage.option.importer": "Importer", + "text.autoconfig.refinedstorage.option.importer.tooltip": "Configuration for the Importer.", "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.importer.energyUsage.tooltip": "The energy used by the Importer.", "text.autoconfig.refinedstorage.option.exporter": "Exporter", + "text.autoconfig.refinedstorage.option.exporter.tooltip": "Configuration for the Exporter.", "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter.energyUsage.tooltip": "The energy used by the Exporter.", "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.tooltip": "Configuration for the Detector.", "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector.energyUsage.tooltip": "The energy used by the Detector.", "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.tooltip": "Configuration for the Constructor.", "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor.energyUsage.tooltip": "The energy used by the Constructor.", "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.tooltip": "Configuration for the Destructor.", "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor.energyUsage.tooltip": "The energy used by the Destructor.", "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.tooltip": "Configuration for the Upgrades.", "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage.tooltip": "The additional energy used per Speed Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage.tooltip": "The additional energy used by the Stack Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 1 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 2 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 3 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage.tooltip": "The additional energy used by the Silk Touch Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage.tooltip": "The additional energy used by the Regulator Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage.tooltip": "The additional energy used per Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage.tooltip": "The additional energy used by the Creative Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange.tooltip": "The additional range provided by the Range Upgrade.", "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.tooltip": "Configuration for the Interface.", "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.iface.energyUsage.tooltip": "The energy used by the Interface.", "text.autoconfig.refinedstorage.option.externalStorage": "External Storage", + "text.autoconfig.refinedstorage.option.externalStorage.tooltip": "Configuration for the External Storage.", "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage.tooltip": "The energy used by the External Storage.", "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.tooltip": "Configuration for the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity.tooltip": "The energy capacity of the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage.tooltip": "The energy used by the Wireless Grid to open.", "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage.tooltip": "The energy used by the Wireless Grid to insert resources.", "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage.tooltip": "The energy used by the Wireless Grid to extract resources.", "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.tooltip": "Configuration for the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage.tooltip": "The energy used by the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange.tooltip": "The base range of the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.tooltip": "Configuration for the Storage Monitor.", "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage.tooltip": "The energy used by the Storage Monitor.", "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.tooltip": "Configuration for the Network Receiver.", "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage.tooltip": "The energy used by the Network Receiver.", "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.tooltip": "Configuration for the Network Transmitter.", "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage.tooltip": "The energy used by the Network Transmitter.", "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.tooltip": "Configuration for the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity.tooltip": "The energy capacity of the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage.tooltip": "The energy used by the Portable Grid to open.", "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage.tooltip": "The energy used by the Portable Grid to insert resources.", "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage.tooltip": "The energy used by the Portable Grid to extract resources.", "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.tooltip": "Configuration for the Security Card.", "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage.tooltip": "The energy used by the Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.tooltip": "Configuration for the Fallback Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage.tooltip": "The energy used by the Fallback Security Card.", "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.tooltip": "Configuration for the Security Manager.", "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage.tooltip": "The energy used by the Security Manager.", "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.tooltip": "Configuration for the Relay.", "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage.tooltip": "Input network energy usage.", "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage.tooltip": "Output network energy usage (if not in pass through mode).", "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", "advancements.refinedstorage.connecting": "Connecting", "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", From 162f3655f0ae418634ee70af91948626ba1b30ec Mon Sep 17 00:00:00 2001 From: Raoul Date: Sun, 21 Jul 2024 01:32:01 +0200 Subject: [PATCH 16/36] chore: update translation Italian from crowdin --- .../assets/refinedstorage/lang/it_it.json | 100 +++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/it_it.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/it_it.json index f08f87e3b..adf9fc563 100644 --- a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/it_it.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/it_it.json @@ -302,6 +302,7 @@ "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", + "key.refinedstorage.open_portable_grid": "Open Portable Grid", "refinedstorage.subtitle.wrench": "Wrench used", "permission.refinedstorage.insert": "Insert", "permission.refinedstorage.insert.description": "Whether the player can insert resources in a network.", @@ -334,99 +335,194 @@ "tag.item.refinedstorage.storage_disks": "Storage Disks", "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.title": "Refined Storage Configuration", + "refinedstorage.configuration.title": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml.title": "Refined Storage Configuration", "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.smoothScrolling.tooltip": "Whether scrollbars should use smooth scrolling.", "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.screenSize.tooltip": "The screen size.", "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.maxRowsStretch.tooltip": "The maximum amount of rows that can be displayed when the screen size is stretched.", "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.tooltip": "Configuration for the Grid.", "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.largeFont.tooltip": "Whether the Grid should use a large font for quantities.", "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown.tooltip": "Whether the Grid should avoid sorting when shift is held down.", "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip.tooltip": "Whether the Grid should show a detailed tooltip.", "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery.tooltip": "Whether the search query should persist when closing and re-opening the Grid.", "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.energyUsage.tooltip": "The energy used by the Grid.", "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.autoSelected.tooltip": "Whether the search box should be auto-selected when opening the Grid.", "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.synchronizer.tooltip": "The synchronization type of the Grid search box.", + "text.autoconfig.refinedstorage.option.grid.resourceType": "Resource type", + "text.autoconfig.refinedstorage.option.grid.resourceType.tooltip": "The resource type to be shown.", "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sorting direction", + "text.autoconfig.refinedstorage.option.grid.sortingDirection.tooltip": "The sorting direction.", "text.autoconfig.refinedstorage.option.grid.sortingType": "Sorting type", + "text.autoconfig.refinedstorage.option.grid.sortingType.tooltip": "The sorting type.", "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.tooltip": "Configuration for the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage.tooltip": "The energy used by the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior.tooltip": "What should happen to the crafting matrix slots when closing the Crafting Grid.", "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.tooltip": "Configuration for the Controller.", "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.controller.energyCapacity.tooltip": "The energy capacity of the Controller.", "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.tooltip": "Configuration for the Cable.", "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.cable.energyUsage.tooltip": "The energy used by the Cable.", "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.tooltip": "Configuration for the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage.tooltip": "The energy used by the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.tooltip": "Configuration for the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage.tooltip": "The energy used by the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.tooltip": "Configuration for the Storage Blocks.", "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage.tooltip": "The energy used by the 1K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage.tooltip": "The energy used by the 4K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage.tooltip": "The energy used by the 16K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage.tooltip": "The energy used by the 64K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.tooltip": "Configuration for the Fluid Storage Blocks.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage.tooltip": "The energy used by the 64B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage.tooltip": "The energy used by the 256B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage.tooltip": "The energy used by the 1024B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage.tooltip": "The energy used by the 4096B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Fluid Storage Block.", "text.autoconfig.refinedstorage.option.importer": "Importer", + "text.autoconfig.refinedstorage.option.importer.tooltip": "Configuration for the Importer.", "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.importer.energyUsage.tooltip": "The energy used by the Importer.", "text.autoconfig.refinedstorage.option.exporter": "Exporter", + "text.autoconfig.refinedstorage.option.exporter.tooltip": "Configuration for the Exporter.", "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter.energyUsage.tooltip": "The energy used by the Exporter.", "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.tooltip": "Configuration for the Detector.", "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector.energyUsage.tooltip": "The energy used by the Detector.", "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.tooltip": "Configuration for the Constructor.", "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor.energyUsage.tooltip": "The energy used by the Constructor.", "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.tooltip": "Configuration for the Destructor.", "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor.energyUsage.tooltip": "The energy used by the Destructor.", "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.tooltip": "Configuration for the Upgrades.", "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage.tooltip": "The additional energy used per Speed Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage.tooltip": "The additional energy used by the Stack Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 1 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 2 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 3 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage.tooltip": "The additional energy used by the Silk Touch Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage.tooltip": "The additional energy used by the Regulator Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage.tooltip": "The additional energy used per Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage.tooltip": "The additional energy used by the Creative Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange.tooltip": "The additional range provided by the Range Upgrade.", "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.tooltip": "Configuration for the Interface.", "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.iface.energyUsage.tooltip": "The energy used by the Interface.", "text.autoconfig.refinedstorage.option.externalStorage": "External Storage", + "text.autoconfig.refinedstorage.option.externalStorage.tooltip": "Configuration for the External Storage.", "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage.tooltip": "The energy used by the External Storage.", "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.tooltip": "Configuration for the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity.tooltip": "The energy capacity of the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage.tooltip": "The energy used by the Wireless Grid to open.", "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage.tooltip": "The energy used by the Wireless Grid to insert resources.", "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage.tooltip": "The energy used by the Wireless Grid to extract resources.", "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.tooltip": "Configuration for the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage.tooltip": "The energy used by the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange.tooltip": "The base range of the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.tooltip": "Configuration for the Storage Monitor.", "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage.tooltip": "The energy used by the Storage Monitor.", "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.tooltip": "Configuration for the Network Receiver.", "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage.tooltip": "The energy used by the Network Receiver.", "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.tooltip": "Configuration for the Network Transmitter.", "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage.tooltip": "The energy used by the Network Transmitter.", "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.tooltip": "Configuration for the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity.tooltip": "The energy capacity of the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage.tooltip": "The energy used by the Portable Grid to open.", "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage.tooltip": "The energy used by the Portable Grid to insert resources.", "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage.tooltip": "The energy used by the Portable Grid to extract resources.", "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.tooltip": "Configuration for the Security Card.", "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage.tooltip": "The energy used by the Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.tooltip": "Configuration for the Fallback Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage.tooltip": "The energy used by the Fallback Security Card.", "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.tooltip": "Configuration for the Security Manager.", "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage.tooltip": "The energy used by the Security Manager.", "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.tooltip": "Configuration for the Relay.", "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage.tooltip": "Input network energy usage.", "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage.tooltip": "Output network energy usage (if not in pass through mode).", "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", "advancements.refinedstorage.connecting": "Connecting", "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", From 86befeba9f1f5985ecbf55fdfa0a9557afc782d9 Mon Sep 17 00:00:00 2001 From: Raoul Date: Sun, 21 Jul 2024 01:32:02 +0200 Subject: [PATCH 17/36] chore: update translation Japanese from crowdin --- .../assets/refinedstorage/lang/ja_jp.json | 100 +++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ja_jp.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ja_jp.json index 56cd7dc0e..4c45dde42 100644 --- a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ja_jp.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ja_jp.json @@ -302,6 +302,7 @@ "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", + "key.refinedstorage.open_portable_grid": "Open Portable Grid", "refinedstorage.subtitle.wrench": "Wrench used", "permission.refinedstorage.insert": "Insert", "permission.refinedstorage.insert.description": "Whether the player can insert resources in a network.", @@ -334,99 +335,194 @@ "tag.item.refinedstorage.storage_disks": "Storage Disks", "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.title": "Refined Storage Configuration", + "refinedstorage.configuration.title": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml.title": "Refined Storage Configuration", "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.smoothScrolling.tooltip": "Whether scrollbars should use smooth scrolling.", "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.screenSize.tooltip": "The screen size.", "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.maxRowsStretch.tooltip": "The maximum amount of rows that can be displayed when the screen size is stretched.", "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.tooltip": "Configuration for the Grid.", "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.largeFont.tooltip": "Whether the Grid should use a large font for quantities.", "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown.tooltip": "Whether the Grid should avoid sorting when shift is held down.", "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip.tooltip": "Whether the Grid should show a detailed tooltip.", "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery.tooltip": "Whether the search query should persist when closing and re-opening the Grid.", "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.energyUsage.tooltip": "The energy used by the Grid.", "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.autoSelected.tooltip": "Whether the search box should be auto-selected when opening the Grid.", "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.synchronizer.tooltip": "The synchronization type of the Grid search box.", + "text.autoconfig.refinedstorage.option.grid.resourceType": "Resource type", + "text.autoconfig.refinedstorage.option.grid.resourceType.tooltip": "The resource type to be shown.", "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sorting direction", + "text.autoconfig.refinedstorage.option.grid.sortingDirection.tooltip": "The sorting direction.", "text.autoconfig.refinedstorage.option.grid.sortingType": "Sorting type", + "text.autoconfig.refinedstorage.option.grid.sortingType.tooltip": "The sorting type.", "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.tooltip": "Configuration for the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage.tooltip": "The energy used by the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior.tooltip": "What should happen to the crafting matrix slots when closing the Crafting Grid.", "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.tooltip": "Configuration for the Controller.", "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.controller.energyCapacity.tooltip": "The energy capacity of the Controller.", "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.tooltip": "Configuration for the Cable.", "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.cable.energyUsage.tooltip": "The energy used by the Cable.", "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.tooltip": "Configuration for the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage.tooltip": "The energy used by the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.tooltip": "Configuration for the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage.tooltip": "The energy used by the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.tooltip": "Configuration for the Storage Blocks.", "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage.tooltip": "The energy used by the 1K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage.tooltip": "The energy used by the 4K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage.tooltip": "The energy used by the 16K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage.tooltip": "The energy used by the 64K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.tooltip": "Configuration for the Fluid Storage Blocks.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage.tooltip": "The energy used by the 64B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage.tooltip": "The energy used by the 256B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage.tooltip": "The energy used by the 1024B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage.tooltip": "The energy used by the 4096B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Fluid Storage Block.", "text.autoconfig.refinedstorage.option.importer": "Importer", + "text.autoconfig.refinedstorage.option.importer.tooltip": "Configuration for the Importer.", "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.importer.energyUsage.tooltip": "The energy used by the Importer.", "text.autoconfig.refinedstorage.option.exporter": "Exporter", + "text.autoconfig.refinedstorage.option.exporter.tooltip": "Configuration for the Exporter.", "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter.energyUsage.tooltip": "The energy used by the Exporter.", "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.tooltip": "Configuration for the Detector.", "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector.energyUsage.tooltip": "The energy used by the Detector.", "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.tooltip": "Configuration for the Constructor.", "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor.energyUsage.tooltip": "The energy used by the Constructor.", "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.tooltip": "Configuration for the Destructor.", "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor.energyUsage.tooltip": "The energy used by the Destructor.", "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.tooltip": "Configuration for the Upgrades.", "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage.tooltip": "The additional energy used per Speed Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage.tooltip": "The additional energy used by the Stack Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 1 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 2 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 3 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage.tooltip": "The additional energy used by the Silk Touch Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage.tooltip": "The additional energy used by the Regulator Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage.tooltip": "The additional energy used per Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage.tooltip": "The additional energy used by the Creative Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange.tooltip": "The additional range provided by the Range Upgrade.", "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.tooltip": "Configuration for the Interface.", "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.iface.energyUsage.tooltip": "The energy used by the Interface.", "text.autoconfig.refinedstorage.option.externalStorage": "External Storage", + "text.autoconfig.refinedstorage.option.externalStorage.tooltip": "Configuration for the External Storage.", "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage.tooltip": "The energy used by the External Storage.", "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.tooltip": "Configuration for the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity.tooltip": "The energy capacity of the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage.tooltip": "The energy used by the Wireless Grid to open.", "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage.tooltip": "The energy used by the Wireless Grid to insert resources.", "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage.tooltip": "The energy used by the Wireless Grid to extract resources.", "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.tooltip": "Configuration for the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage.tooltip": "The energy used by the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange.tooltip": "The base range of the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.tooltip": "Configuration for the Storage Monitor.", "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage.tooltip": "The energy used by the Storage Monitor.", "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.tooltip": "Configuration for the Network Receiver.", "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage.tooltip": "The energy used by the Network Receiver.", "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.tooltip": "Configuration for the Network Transmitter.", "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage.tooltip": "The energy used by the Network Transmitter.", "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.tooltip": "Configuration for the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity.tooltip": "The energy capacity of the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage.tooltip": "The energy used by the Portable Grid to open.", "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage.tooltip": "The energy used by the Portable Grid to insert resources.", "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage.tooltip": "The energy used by the Portable Grid to extract resources.", "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.tooltip": "Configuration for the Security Card.", "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage.tooltip": "The energy used by the Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.tooltip": "Configuration for the Fallback Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage.tooltip": "The energy used by the Fallback Security Card.", "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.tooltip": "Configuration for the Security Manager.", "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage.tooltip": "The energy used by the Security Manager.", "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.tooltip": "Configuration for the Relay.", "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage.tooltip": "Input network energy usage.", "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage.tooltip": "Output network energy usage (if not in pass through mode).", "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", "advancements.refinedstorage.connecting": "Connecting", "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", From 4e80571882c7671b4aa7c07c0075c1d9f4773ed7 Mon Sep 17 00:00:00 2001 From: Raoul Date: Sun, 21 Jul 2024 01:32:03 +0200 Subject: [PATCH 18/36] chore: update translation Korean from crowdin --- .../assets/refinedstorage/lang/ko_kr.json | 100 +++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ko_kr.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ko_kr.json index f08f87e3b..adf9fc563 100644 --- a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ko_kr.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ko_kr.json @@ -302,6 +302,7 @@ "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", + "key.refinedstorage.open_portable_grid": "Open Portable Grid", "refinedstorage.subtitle.wrench": "Wrench used", "permission.refinedstorage.insert": "Insert", "permission.refinedstorage.insert.description": "Whether the player can insert resources in a network.", @@ -334,99 +335,194 @@ "tag.item.refinedstorage.storage_disks": "Storage Disks", "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.title": "Refined Storage Configuration", + "refinedstorage.configuration.title": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml.title": "Refined Storage Configuration", "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.smoothScrolling.tooltip": "Whether scrollbars should use smooth scrolling.", "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.screenSize.tooltip": "The screen size.", "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.maxRowsStretch.tooltip": "The maximum amount of rows that can be displayed when the screen size is stretched.", "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.tooltip": "Configuration for the Grid.", "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.largeFont.tooltip": "Whether the Grid should use a large font for quantities.", "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown.tooltip": "Whether the Grid should avoid sorting when shift is held down.", "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip.tooltip": "Whether the Grid should show a detailed tooltip.", "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery.tooltip": "Whether the search query should persist when closing and re-opening the Grid.", "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.energyUsage.tooltip": "The energy used by the Grid.", "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.autoSelected.tooltip": "Whether the search box should be auto-selected when opening the Grid.", "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.synchronizer.tooltip": "The synchronization type of the Grid search box.", + "text.autoconfig.refinedstorage.option.grid.resourceType": "Resource type", + "text.autoconfig.refinedstorage.option.grid.resourceType.tooltip": "The resource type to be shown.", "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sorting direction", + "text.autoconfig.refinedstorage.option.grid.sortingDirection.tooltip": "The sorting direction.", "text.autoconfig.refinedstorage.option.grid.sortingType": "Sorting type", + "text.autoconfig.refinedstorage.option.grid.sortingType.tooltip": "The sorting type.", "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.tooltip": "Configuration for the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage.tooltip": "The energy used by the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior.tooltip": "What should happen to the crafting matrix slots when closing the Crafting Grid.", "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.tooltip": "Configuration for the Controller.", "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.controller.energyCapacity.tooltip": "The energy capacity of the Controller.", "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.tooltip": "Configuration for the Cable.", "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.cable.energyUsage.tooltip": "The energy used by the Cable.", "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.tooltip": "Configuration for the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage.tooltip": "The energy used by the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.tooltip": "Configuration for the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage.tooltip": "The energy used by the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.tooltip": "Configuration for the Storage Blocks.", "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage.tooltip": "The energy used by the 1K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage.tooltip": "The energy used by the 4K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage.tooltip": "The energy used by the 16K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage.tooltip": "The energy used by the 64K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.tooltip": "Configuration for the Fluid Storage Blocks.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage.tooltip": "The energy used by the 64B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage.tooltip": "The energy used by the 256B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage.tooltip": "The energy used by the 1024B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage.tooltip": "The energy used by the 4096B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Fluid Storage Block.", "text.autoconfig.refinedstorage.option.importer": "Importer", + "text.autoconfig.refinedstorage.option.importer.tooltip": "Configuration for the Importer.", "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.importer.energyUsage.tooltip": "The energy used by the Importer.", "text.autoconfig.refinedstorage.option.exporter": "Exporter", + "text.autoconfig.refinedstorage.option.exporter.tooltip": "Configuration for the Exporter.", "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter.energyUsage.tooltip": "The energy used by the Exporter.", "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.tooltip": "Configuration for the Detector.", "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector.energyUsage.tooltip": "The energy used by the Detector.", "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.tooltip": "Configuration for the Constructor.", "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor.energyUsage.tooltip": "The energy used by the Constructor.", "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.tooltip": "Configuration for the Destructor.", "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor.energyUsage.tooltip": "The energy used by the Destructor.", "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.tooltip": "Configuration for the Upgrades.", "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage.tooltip": "The additional energy used per Speed Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage.tooltip": "The additional energy used by the Stack Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 1 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 2 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 3 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage.tooltip": "The additional energy used by the Silk Touch Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage.tooltip": "The additional energy used by the Regulator Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage.tooltip": "The additional energy used per Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage.tooltip": "The additional energy used by the Creative Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange.tooltip": "The additional range provided by the Range Upgrade.", "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.tooltip": "Configuration for the Interface.", "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.iface.energyUsage.tooltip": "The energy used by the Interface.", "text.autoconfig.refinedstorage.option.externalStorage": "External Storage", + "text.autoconfig.refinedstorage.option.externalStorage.tooltip": "Configuration for the External Storage.", "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage.tooltip": "The energy used by the External Storage.", "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.tooltip": "Configuration for the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity.tooltip": "The energy capacity of the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage.tooltip": "The energy used by the Wireless Grid to open.", "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage.tooltip": "The energy used by the Wireless Grid to insert resources.", "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage.tooltip": "The energy used by the Wireless Grid to extract resources.", "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.tooltip": "Configuration for the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage.tooltip": "The energy used by the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange.tooltip": "The base range of the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.tooltip": "Configuration for the Storage Monitor.", "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage.tooltip": "The energy used by the Storage Monitor.", "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.tooltip": "Configuration for the Network Receiver.", "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage.tooltip": "The energy used by the Network Receiver.", "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.tooltip": "Configuration for the Network Transmitter.", "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage.tooltip": "The energy used by the Network Transmitter.", "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.tooltip": "Configuration for the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity.tooltip": "The energy capacity of the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage.tooltip": "The energy used by the Portable Grid to open.", "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage.tooltip": "The energy used by the Portable Grid to insert resources.", "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage.tooltip": "The energy used by the Portable Grid to extract resources.", "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.tooltip": "Configuration for the Security Card.", "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage.tooltip": "The energy used by the Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.tooltip": "Configuration for the Fallback Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage.tooltip": "The energy used by the Fallback Security Card.", "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.tooltip": "Configuration for the Security Manager.", "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage.tooltip": "The energy used by the Security Manager.", "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.tooltip": "Configuration for the Relay.", "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage.tooltip": "Input network energy usage.", "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage.tooltip": "Output network energy usage (if not in pass through mode).", "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", "advancements.refinedstorage.connecting": "Connecting", "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", From 2cce58459ed325fb5f2a5106ed47d2a780c9d19c Mon Sep 17 00:00:00 2001 From: Raoul Date: Sun, 21 Jul 2024 01:32:04 +0200 Subject: [PATCH 19/36] chore: update translation Polish from crowdin --- .../assets/refinedstorage/lang/pl_pl.json | 100 +++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/pl_pl.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/pl_pl.json index 2fbd84b22..a4280a4c7 100644 --- a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/pl_pl.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/pl_pl.json @@ -302,6 +302,7 @@ "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", + "key.refinedstorage.open_portable_grid": "Open Portable Grid", "refinedstorage.subtitle.wrench": "Wrench used", "permission.refinedstorage.insert": "Insert", "permission.refinedstorage.insert.description": "Whether the player can insert resources in a network.", @@ -334,99 +335,194 @@ "tag.item.refinedstorage.storage_disks": "Storage Disks", "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.title": "Refined Storage Configuration", + "refinedstorage.configuration.title": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml.title": "Refined Storage Configuration", "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.smoothScrolling.tooltip": "Whether scrollbars should use smooth scrolling.", "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.screenSize.tooltip": "The screen size.", "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.maxRowsStretch.tooltip": "The maximum amount of rows that can be displayed when the screen size is stretched.", "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.tooltip": "Configuration for the Grid.", "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.largeFont.tooltip": "Whether the Grid should use a large font for quantities.", "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown.tooltip": "Whether the Grid should avoid sorting when shift is held down.", "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip.tooltip": "Whether the Grid should show a detailed tooltip.", "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery.tooltip": "Whether the search query should persist when closing and re-opening the Grid.", "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.energyUsage.tooltip": "The energy used by the Grid.", "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.autoSelected.tooltip": "Whether the search box should be auto-selected when opening the Grid.", "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.synchronizer.tooltip": "The synchronization type of the Grid search box.", + "text.autoconfig.refinedstorage.option.grid.resourceType": "Resource type", + "text.autoconfig.refinedstorage.option.grid.resourceType.tooltip": "The resource type to be shown.", "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sorting direction", + "text.autoconfig.refinedstorage.option.grid.sortingDirection.tooltip": "The sorting direction.", "text.autoconfig.refinedstorage.option.grid.sortingType": "Sorting type", + "text.autoconfig.refinedstorage.option.grid.sortingType.tooltip": "The sorting type.", "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.tooltip": "Configuration for the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage.tooltip": "The energy used by the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior.tooltip": "What should happen to the crafting matrix slots when closing the Crafting Grid.", "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.tooltip": "Configuration for the Controller.", "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.controller.energyCapacity.tooltip": "The energy capacity of the Controller.", "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.tooltip": "Configuration for the Cable.", "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.cable.energyUsage.tooltip": "The energy used by the Cable.", "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.tooltip": "Configuration for the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage.tooltip": "The energy used by the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.tooltip": "Configuration for the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage.tooltip": "The energy used by the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.tooltip": "Configuration for the Storage Blocks.", "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage.tooltip": "The energy used by the 1K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage.tooltip": "The energy used by the 4K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage.tooltip": "The energy used by the 16K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage.tooltip": "The energy used by the 64K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.tooltip": "Configuration for the Fluid Storage Blocks.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage.tooltip": "The energy used by the 64B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage.tooltip": "The energy used by the 256B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage.tooltip": "The energy used by the 1024B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage.tooltip": "The energy used by the 4096B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Fluid Storage Block.", "text.autoconfig.refinedstorage.option.importer": "Importer", + "text.autoconfig.refinedstorage.option.importer.tooltip": "Configuration for the Importer.", "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.importer.energyUsage.tooltip": "The energy used by the Importer.", "text.autoconfig.refinedstorage.option.exporter": "Exporter", + "text.autoconfig.refinedstorage.option.exporter.tooltip": "Configuration for the Exporter.", "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter.energyUsage.tooltip": "The energy used by the Exporter.", "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.tooltip": "Configuration for the Detector.", "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector.energyUsage.tooltip": "The energy used by the Detector.", "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.tooltip": "Configuration for the Constructor.", "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor.energyUsage.tooltip": "The energy used by the Constructor.", "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.tooltip": "Configuration for the Destructor.", "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor.energyUsage.tooltip": "The energy used by the Destructor.", "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.tooltip": "Configuration for the Upgrades.", "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage.tooltip": "The additional energy used per Speed Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage.tooltip": "The additional energy used by the Stack Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 1 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 2 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 3 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage.tooltip": "The additional energy used by the Silk Touch Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage.tooltip": "The additional energy used by the Regulator Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage.tooltip": "The additional energy used per Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage.tooltip": "The additional energy used by the Creative Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange.tooltip": "The additional range provided by the Range Upgrade.", "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.tooltip": "Configuration for the Interface.", "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.iface.energyUsage.tooltip": "The energy used by the Interface.", "text.autoconfig.refinedstorage.option.externalStorage": "Zewnętrzny magazyn", + "text.autoconfig.refinedstorage.option.externalStorage.tooltip": "Configuration for the External Storage.", "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Zużycie energii", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage.tooltip": "The energy used by the External Storage.", "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.tooltip": "Configuration for the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity.tooltip": "The energy capacity of the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage.tooltip": "The energy used by the Wireless Grid to open.", "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage.tooltip": "The energy used by the Wireless Grid to insert resources.", "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage.tooltip": "The energy used by the Wireless Grid to extract resources.", "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.tooltip": "Configuration for the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage.tooltip": "The energy used by the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange.tooltip": "The base range of the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.tooltip": "Configuration for the Storage Monitor.", "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage.tooltip": "The energy used by the Storage Monitor.", "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.tooltip": "Configuration for the Network Receiver.", "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage.tooltip": "The energy used by the Network Receiver.", "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.tooltip": "Configuration for the Network Transmitter.", "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage.tooltip": "The energy used by the Network Transmitter.", "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.tooltip": "Configuration for the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity.tooltip": "The energy capacity of the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage.tooltip": "The energy used by the Portable Grid to open.", "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage.tooltip": "The energy used by the Portable Grid to insert resources.", "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage.tooltip": "The energy used by the Portable Grid to extract resources.", "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.tooltip": "Configuration for the Security Card.", "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage.tooltip": "The energy used by the Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.tooltip": "Configuration for the Fallback Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage.tooltip": "The energy used by the Fallback Security Card.", "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.tooltip": "Configuration for the Security Manager.", "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage.tooltip": "The energy used by the Security Manager.", "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.tooltip": "Configuration for the Relay.", "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage.tooltip": "Input network energy usage.", "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage.tooltip": "Output network energy usage (if not in pass through mode).", "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", "advancements.refinedstorage.connecting": "Connecting", "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", From 5784ed8c6dde4fb5400cacc2e1d54a38761a22e0 Mon Sep 17 00:00:00 2001 From: Raoul Date: Sun, 21 Jul 2024 01:32:05 +0200 Subject: [PATCH 20/36] chore: update translation Russian from crowdin --- .../assets/refinedstorage/lang/ru_ru.json | 100 +++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ru_ru.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ru_ru.json index 0b3c8b15c..7b074251b 100644 --- a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ru_ru.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ru_ru.json @@ -302,6 +302,7 @@ "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", + "key.refinedstorage.open_portable_grid": "Open Portable Grid", "refinedstorage.subtitle.wrench": "Wrench used", "permission.refinedstorage.insert": "Insert", "permission.refinedstorage.insert.description": "Whether the player can insert resources in a network.", @@ -334,99 +335,194 @@ "tag.item.refinedstorage.storage_disks": "Storage Disks", "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.title": "Refined Storage Configuration", + "refinedstorage.configuration.title": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml.title": "Refined Storage Configuration", "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.smoothScrolling.tooltip": "Whether scrollbars should use smooth scrolling.", "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.screenSize.tooltip": "The screen size.", "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.maxRowsStretch.tooltip": "The maximum amount of rows that can be displayed when the screen size is stretched.", "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.tooltip": "Configuration for the Grid.", "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.largeFont.tooltip": "Whether the Grid should use a large font for quantities.", "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown.tooltip": "Whether the Grid should avoid sorting when shift is held down.", "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip.tooltip": "Whether the Grid should show a detailed tooltip.", "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery.tooltip": "Whether the search query should persist when closing and re-opening the Grid.", "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.energyUsage.tooltip": "The energy used by the Grid.", "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.autoSelected.tooltip": "Whether the search box should be auto-selected when opening the Grid.", "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.synchronizer.tooltip": "The synchronization type of the Grid search box.", + "text.autoconfig.refinedstorage.option.grid.resourceType": "Resource type", + "text.autoconfig.refinedstorage.option.grid.resourceType.tooltip": "The resource type to be shown.", "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sorting direction", + "text.autoconfig.refinedstorage.option.grid.sortingDirection.tooltip": "The sorting direction.", "text.autoconfig.refinedstorage.option.grid.sortingType": "Sorting type", + "text.autoconfig.refinedstorage.option.grid.sortingType.tooltip": "The sorting type.", "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.tooltip": "Configuration for the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage.tooltip": "The energy used by the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior.tooltip": "What should happen to the crafting matrix slots when closing the Crafting Grid.", "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.tooltip": "Configuration for the Controller.", "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.controller.energyCapacity.tooltip": "The energy capacity of the Controller.", "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.tooltip": "Configuration for the Cable.", "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.cable.energyUsage.tooltip": "The energy used by the Cable.", "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.tooltip": "Configuration for the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage.tooltip": "The energy used by the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.tooltip": "Configuration for the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage.tooltip": "The energy used by the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.tooltip": "Configuration for the Storage Blocks.", "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage.tooltip": "The energy used by the 1K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage.tooltip": "The energy used by the 4K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage.tooltip": "The energy used by the 16K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage.tooltip": "The energy used by the 64K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.tooltip": "Configuration for the Fluid Storage Blocks.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage.tooltip": "The energy used by the 64B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage.tooltip": "The energy used by the 256B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage.tooltip": "The energy used by the 1024B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage.tooltip": "The energy used by the 4096B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Fluid Storage Block.", "text.autoconfig.refinedstorage.option.importer": "Importer", + "text.autoconfig.refinedstorage.option.importer.tooltip": "Configuration for the Importer.", "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.importer.energyUsage.tooltip": "The energy used by the Importer.", "text.autoconfig.refinedstorage.option.exporter": "Exporter", + "text.autoconfig.refinedstorage.option.exporter.tooltip": "Configuration for the Exporter.", "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter.energyUsage.tooltip": "The energy used by the Exporter.", "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.tooltip": "Configuration for the Detector.", "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector.energyUsage.tooltip": "The energy used by the Detector.", "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.tooltip": "Configuration for the Constructor.", "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor.energyUsage.tooltip": "The energy used by the Constructor.", "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.tooltip": "Configuration for the Destructor.", "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor.energyUsage.tooltip": "The energy used by the Destructor.", "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.tooltip": "Configuration for the Upgrades.", "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage.tooltip": "The additional energy used per Speed Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage.tooltip": "The additional energy used by the Stack Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 1 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 2 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 3 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage.tooltip": "The additional energy used by the Silk Touch Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage.tooltip": "The additional energy used by the Regulator Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage.tooltip": "The additional energy used per Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage.tooltip": "The additional energy used by the Creative Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange.tooltip": "The additional range provided by the Range Upgrade.", "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.tooltip": "Configuration for the Interface.", "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.iface.energyUsage.tooltip": "The energy used by the Interface.", "text.autoconfig.refinedstorage.option.externalStorage": "External Storage", + "text.autoconfig.refinedstorage.option.externalStorage.tooltip": "Configuration for the External Storage.", "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage.tooltip": "The energy used by the External Storage.", "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.tooltip": "Configuration for the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity.tooltip": "The energy capacity of the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage.tooltip": "The energy used by the Wireless Grid to open.", "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage.tooltip": "The energy used by the Wireless Grid to insert resources.", "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage.tooltip": "The energy used by the Wireless Grid to extract resources.", "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.tooltip": "Configuration for the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage.tooltip": "The energy used by the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange.tooltip": "The base range of the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.tooltip": "Configuration for the Storage Monitor.", "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage.tooltip": "The energy used by the Storage Monitor.", "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.tooltip": "Configuration for the Network Receiver.", "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage.tooltip": "The energy used by the Network Receiver.", "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.tooltip": "Configuration for the Network Transmitter.", "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage.tooltip": "The energy used by the Network Transmitter.", "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.tooltip": "Configuration for the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity.tooltip": "The energy capacity of the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage.tooltip": "The energy used by the Portable Grid to open.", "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage.tooltip": "The energy used by the Portable Grid to insert resources.", "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage.tooltip": "The energy used by the Portable Grid to extract resources.", "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.tooltip": "Configuration for the Security Card.", "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage.tooltip": "The energy used by the Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.tooltip": "Configuration for the Fallback Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage.tooltip": "The energy used by the Fallback Security Card.", "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.tooltip": "Configuration for the Security Manager.", "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage.tooltip": "The energy used by the Security Manager.", "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.tooltip": "Configuration for the Relay.", "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage.tooltip": "Input network energy usage.", "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage.tooltip": "Output network energy usage (if not in pass through mode).", "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", "advancements.refinedstorage.connecting": "Connecting", "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", From adcc8dda67166871c70bac86d36e16b654863190 Mon Sep 17 00:00:00 2001 From: Raoul Date: Sun, 21 Jul 2024 01:32:06 +0200 Subject: [PATCH 21/36] chore: update translation Chinese Simplified from crowdin --- .../assets/refinedstorage/lang/zh_cn.json | 100 +++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/zh_cn.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/zh_cn.json index b5424ef88..c585ecc29 100644 --- a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/zh_cn.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/zh_cn.json @@ -302,6 +302,7 @@ "key.refinedstorage.clear_crafting_grid_matrix_to_network": "清除合成终端矩阵到网络", "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "清除合成终端矩阵到库存", "key.refinedstorage.open_wireless_grid": "打开无线终端", + "key.refinedstorage.open_portable_grid": "Open Portable Grid", "refinedstorage.subtitle.wrench": "使用扳手", "permission.refinedstorage.insert": "存入", "permission.refinedstorage.insert.description": "玩家是否可以向存储网络中存入资源", @@ -334,99 +335,194 @@ "tag.item.refinedstorage.storage_disks": "Storage Disks", "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage.title": "精致存储 2", + "text.autoconfig.refinedstorage.title": "Refined Storage Configuration", + "refinedstorage.configuration.title": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml.title": "Refined Storage Configuration", "text.autoconfig.refinedstorage.option.smoothScrolling": "平滑滚动", + "text.autoconfig.refinedstorage.option.smoothScrolling.tooltip": "Whether scrollbars should use smooth scrolling.", "text.autoconfig.refinedstorage.option.screenSize": "界面大小", + "text.autoconfig.refinedstorage.option.screenSize.tooltip": "The screen size.", "text.autoconfig.refinedstorage.option.maxRowsStretch": "截面尺寸拉伸时的最大显示行数", + "text.autoconfig.refinedstorage.option.maxRowsStretch.tooltip": "The maximum amount of rows that can be displayed when the screen size is stretched.", "text.autoconfig.refinedstorage.option.grid": "终端", + "text.autoconfig.refinedstorage.option.grid.tooltip": "Configuration for the Grid.", "text.autoconfig.refinedstorage.option.grid.largeFont": "大字体", + "text.autoconfig.refinedstorage.option.grid.largeFont.tooltip": "Whether the Grid should use a large font for quantities.", "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "按住 SHIFT 时阻止排序", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown.tooltip": "Whether the Grid should avoid sorting when shift is held down.", "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "详细提示", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip.tooltip": "Whether the Grid should show a detailed tooltip.", "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "记住搜索查询", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery.tooltip": "Whether the search query should persist when closing and re-opening the Grid.", "text.autoconfig.refinedstorage.option.grid.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.grid.energyUsage.tooltip": "The energy used by the Grid.", "text.autoconfig.refinedstorage.option.grid.autoSelected": "自动选择搜索框", + "text.autoconfig.refinedstorage.option.grid.autoSelected.tooltip": "Whether the search box should be auto-selected when opening the Grid.", "text.autoconfig.refinedstorage.option.grid.synchronizer": "同步器", - "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "存储通道类型", + "text.autoconfig.refinedstorage.option.grid.synchronizer.tooltip": "The synchronization type of the Grid search box.", + "text.autoconfig.refinedstorage.option.grid.resourceType": "Resource type", + "text.autoconfig.refinedstorage.option.grid.resourceType.tooltip": "The resource type to be shown.", "text.autoconfig.refinedstorage.option.grid.sortingDirection": "排序方向", + "text.autoconfig.refinedstorage.option.grid.sortingDirection.tooltip": "The sorting direction.", "text.autoconfig.refinedstorage.option.grid.sortingType": "排序类型", + "text.autoconfig.refinedstorage.option.grid.sortingType.tooltip": "The sorting type.", "text.autoconfig.refinedstorage.option.craftingGrid": "合成终端", + "text.autoconfig.refinedstorage.option.craftingGrid.tooltip": "Configuration for the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage.tooltip": "The energy used by the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "合成矩阵关闭行为", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior.tooltip": "What should happen to the crafting matrix slots when closing the Crafting Grid.", "text.autoconfig.refinedstorage.option.controller": "控制器", + "text.autoconfig.refinedstorage.option.controller.tooltip": "Configuration for the Controller.", "text.autoconfig.refinedstorage.option.controller.energyCapacity": "能量容量", + "text.autoconfig.refinedstorage.option.controller.energyCapacity.tooltip": "The energy capacity of the Controller.", "text.autoconfig.refinedstorage.option.cable": "电缆", + "text.autoconfig.refinedstorage.option.cable.tooltip": "Configuration for the Cable.", "text.autoconfig.refinedstorage.option.cable.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.cable.energyUsage.tooltip": "The energy used by the Cable.", "text.autoconfig.refinedstorage.option.diskDrive": "磁盘驱动器", + "text.autoconfig.refinedstorage.option.diskDrive.tooltip": "Configuration for the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage.tooltip": "The energy used by the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "每个磁盘的耗能", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.tooltip": "Configuration for the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage.tooltip": "The energy used by the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.storageBlock": "存储方块", + "text.autoconfig.refinedstorage.option.storageBlock.tooltip": "Configuration for the Storage Blocks.", "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K 能源", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage.tooltip": "The energy used by the 1K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K 能源", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage.tooltip": "The energy used by the 4K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K 能源", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage.tooltip": "The energy used by the 16K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K 能源", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage.tooltip": "The energy used by the 64K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "创造能源", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock": "流体存储块", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.tooltip": "Configuration for the Fluid Storage Blocks.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B 能源", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage.tooltip": "The energy used by the 64B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B 能源", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage.tooltip": "The energy used by the 256B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B 能源", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage.tooltip": "The energy used by the 1024B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B 能源", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage.tooltip": "The energy used by the 4096B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "创造能源", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Fluid Storage Block.", "text.autoconfig.refinedstorage.option.importer": "输入总线", + "text.autoconfig.refinedstorage.option.importer.tooltip": "Configuration for the Importer.", "text.autoconfig.refinedstorage.option.importer.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.importer.energyUsage.tooltip": "The energy used by the Importer.", "text.autoconfig.refinedstorage.option.exporter": "输出总线", + "text.autoconfig.refinedstorage.option.exporter.tooltip": "Configuration for the Exporter.", "text.autoconfig.refinedstorage.option.exporter.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.exporter.energyUsage.tooltip": "The energy used by the Exporter.", "text.autoconfig.refinedstorage.option.detector": "检测器", + "text.autoconfig.refinedstorage.option.detector.tooltip": "Configuration for the Detector.", "text.autoconfig.refinedstorage.option.detector.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.detector.energyUsage.tooltip": "The energy used by the Detector.", "text.autoconfig.refinedstorage.option.constructor": "成型面板", + "text.autoconfig.refinedstorage.option.constructor.tooltip": "Configuration for the Constructor.", "text.autoconfig.refinedstorage.option.constructor.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.constructor.energyUsage.tooltip": "The energy used by the Constructor.", "text.autoconfig.refinedstorage.option.destructor": "破坏面板", + "text.autoconfig.refinedstorage.option.destructor.tooltip": "Configuration for the Destructor.", "text.autoconfig.refinedstorage.option.destructor.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.destructor.energyUsage.tooltip": "The energy used by the Destructor.", "text.autoconfig.refinedstorage.option.upgrade": "升级", + "text.autoconfig.refinedstorage.option.upgrade.tooltip": "Configuration for the Upgrades.", "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "速度升级耗能", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage.tooltip": "The additional energy used per Speed Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "堆叠升级耗能", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage.tooltip": "The additional energy used by the Stack Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "时运 I 升级耗能", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 1 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "时运 II 升级耗能", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 2 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "时运 III 升级耗能", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 3 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "精准采集升级耗能", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage.tooltip": "The additional energy used by the Silk Touch Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "调节器升级耗能", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage.tooltip": "The additional energy used by the Regulator Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "范围升级耗能", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage.tooltip": "The additional energy used per Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "创造范围升级耗能", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage.tooltip": "The additional energy used by the Creative Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "范围升级范围", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange.tooltip": "The additional range provided by the Range Upgrade.", "text.autoconfig.refinedstorage.option.iface": "物品传输接口", + "text.autoconfig.refinedstorage.option.iface.tooltip": "Configuration for the Interface.", "text.autoconfig.refinedstorage.option.iface.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.iface.energyUsage.tooltip": "The energy used by the Interface.", "text.autoconfig.refinedstorage.option.externalStorage": "外部存储", + "text.autoconfig.refinedstorage.option.externalStorage.tooltip": "Configuration for the External Storage.", "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage.tooltip": "The energy used by the External Storage.", "text.autoconfig.refinedstorage.option.wirelessGrid": "无线网格", + "text.autoconfig.refinedstorage.option.wirelessGrid.tooltip": "Configuration for the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "能量容量", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity.tooltip": "The energy capacity of the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "打开耗能", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage.tooltip": "The energy used by the Wireless Grid to open.", "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "插入耗能", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage.tooltip": "The energy used by the Wireless Grid to insert resources.", "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "取出耗能", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage.tooltip": "The energy used by the Wireless Grid to extract resources.", "text.autoconfig.refinedstorage.option.wirelessTransmitter": "无线访问点", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.tooltip": "Configuration for the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage.tooltip": "The energy used by the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "基础范围", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange.tooltip": "The base range of the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.storageMonitor": "存储监控器", + "text.autoconfig.refinedstorage.option.storageMonitor.tooltip": "Configuration for the Storage Monitor.", "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage.tooltip": "The energy used by the Storage Monitor.", "text.autoconfig.refinedstorage.option.networkReceiver": "网络接收器", + "text.autoconfig.refinedstorage.option.networkReceiver.tooltip": "Configuration for the Network Receiver.", "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage.tooltip": "The energy used by the Network Receiver.", "text.autoconfig.refinedstorage.option.networkTransmitter": "网络发送器", + "text.autoconfig.refinedstorage.option.networkTransmitter.tooltip": "Configuration for the Network Transmitter.", "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage.tooltip": "The energy used by the Network Transmitter.", "text.autoconfig.refinedstorage.option.portableGrid": "便携式终端", + "text.autoconfig.refinedstorage.option.portableGrid.tooltip": "Configuration for the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "能量容量", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity.tooltip": "The energy capacity of the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "打开耗能", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage.tooltip": "The energy used by the Portable Grid to open.", "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "插入耗能", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage.tooltip": "The energy used by the Portable Grid to insert resources.", "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "取出耗能", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage.tooltip": "The energy used by the Portable Grid to extract resources.", "text.autoconfig.refinedstorage.option.securityCard": "权限卡", + "text.autoconfig.refinedstorage.option.securityCard.tooltip": "Configuration for the Security Card.", "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage.tooltip": "The energy used by the Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "后备权限卡", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.tooltip": "Configuration for the Fallback Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage.tooltip": "The energy used by the Fallback Security Card.", "text.autoconfig.refinedstorage.option.securityManager": "权限管理器", + "text.autoconfig.refinedstorage.option.securityManager.tooltip": "Configuration for the Security Manager.", "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage.tooltip": "The energy used by the Security Manager.", "text.autoconfig.refinedstorage.option.relay": "中继器", + "text.autoconfig.refinedstorage.option.relay.tooltip": "Configuration for the Relay.", "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "输入网络耗能", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage.tooltip": "Input network energy usage.", "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage.tooltip": "Output network energy usage (if not in pass through mode).", "advancements.refinedstorage.root.description": "在网络中使用一个或多个控制器为其提供能量", "advancements.refinedstorage.connecting": "连接", "advancements.refinedstorage.connecting.description": "使用电缆将设备连接在一起，或放置时使设备贴在一起", From fef643f4f62d154a06562a70764290ea77860c35 Mon Sep 17 00:00:00 2001 From: Raoul Date: Sun, 21 Jul 2024 01:32:08 +0200 Subject: [PATCH 22/36] chore: update translation Chinese Traditional from crowdin --- .../assets/refinedstorage/lang/zh_tw.json | 100 +++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/zh_tw.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/zh_tw.json index f08f87e3b..adf9fc563 100644 --- a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/zh_tw.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/zh_tw.json @@ -302,6 +302,7 @@ "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", + "key.refinedstorage.open_portable_grid": "Open Portable Grid", "refinedstorage.subtitle.wrench": "Wrench used", "permission.refinedstorage.insert": "Insert", "permission.refinedstorage.insert.description": "Whether the player can insert resources in a network.", @@ -334,99 +335,194 @@ "tag.item.refinedstorage.storage_disks": "Storage Disks", "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.title": "Refined Storage Configuration", + "refinedstorage.configuration.title": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml.title": "Refined Storage Configuration", "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.smoothScrolling.tooltip": "Whether scrollbars should use smooth scrolling.", "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.screenSize.tooltip": "The screen size.", "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.maxRowsStretch.tooltip": "The maximum amount of rows that can be displayed when the screen size is stretched.", "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.tooltip": "Configuration for the Grid.", "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.largeFont.tooltip": "Whether the Grid should use a large font for quantities.", "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown.tooltip": "Whether the Grid should avoid sorting when shift is held down.", "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip.tooltip": "Whether the Grid should show a detailed tooltip.", "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery.tooltip": "Whether the search query should persist when closing and re-opening the Grid.", "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.energyUsage.tooltip": "The energy used by the Grid.", "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.autoSelected.tooltip": "Whether the search box should be auto-selected when opening the Grid.", "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.synchronizer.tooltip": "The synchronization type of the Grid search box.", + "text.autoconfig.refinedstorage.option.grid.resourceType": "Resource type", + "text.autoconfig.refinedstorage.option.grid.resourceType.tooltip": "The resource type to be shown.", "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sorting direction", + "text.autoconfig.refinedstorage.option.grid.sortingDirection.tooltip": "The sorting direction.", "text.autoconfig.refinedstorage.option.grid.sortingType": "Sorting type", + "text.autoconfig.refinedstorage.option.grid.sortingType.tooltip": "The sorting type.", "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.tooltip": "Configuration for the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage.tooltip": "The energy used by the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior.tooltip": "What should happen to the crafting matrix slots when closing the Crafting Grid.", "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.tooltip": "Configuration for the Controller.", "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.controller.energyCapacity.tooltip": "The energy capacity of the Controller.", "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.tooltip": "Configuration for the Cable.", "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.cable.energyUsage.tooltip": "The energy used by the Cable.", "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.tooltip": "Configuration for the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage.tooltip": "The energy used by the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.tooltip": "Configuration for the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage.tooltip": "The energy used by the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.tooltip": "Configuration for the Storage Blocks.", "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage.tooltip": "The energy used by the 1K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage.tooltip": "The energy used by the 4K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage.tooltip": "The energy used by the 16K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage.tooltip": "The energy used by the 64K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.tooltip": "Configuration for the Fluid Storage Blocks.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage.tooltip": "The energy used by the 64B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage.tooltip": "The energy used by the 256B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage.tooltip": "The energy used by the 1024B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage.tooltip": "The energy used by the 4096B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Fluid Storage Block.", "text.autoconfig.refinedstorage.option.importer": "Importer", + "text.autoconfig.refinedstorage.option.importer.tooltip": "Configuration for the Importer.", "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.importer.energyUsage.tooltip": "The energy used by the Importer.", "text.autoconfig.refinedstorage.option.exporter": "Exporter", + "text.autoconfig.refinedstorage.option.exporter.tooltip": "Configuration for the Exporter.", "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter.energyUsage.tooltip": "The energy used by the Exporter.", "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.tooltip": "Configuration for the Detector.", "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector.energyUsage.tooltip": "The energy used by the Detector.", "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.tooltip": "Configuration for the Constructor.", "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor.energyUsage.tooltip": "The energy used by the Constructor.", "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.tooltip": "Configuration for the Destructor.", "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor.energyUsage.tooltip": "The energy used by the Destructor.", "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.tooltip": "Configuration for the Upgrades.", "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage.tooltip": "The additional energy used per Speed Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage.tooltip": "The additional energy used by the Stack Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 1 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 2 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 3 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage.tooltip": "The additional energy used by the Silk Touch Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage.tooltip": "The additional energy used by the Regulator Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage.tooltip": "The additional energy used per Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage.tooltip": "The additional energy used by the Creative Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange.tooltip": "The additional range provided by the Range Upgrade.", "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.tooltip": "Configuration for the Interface.", "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.iface.energyUsage.tooltip": "The energy used by the Interface.", "text.autoconfig.refinedstorage.option.externalStorage": "External Storage", + "text.autoconfig.refinedstorage.option.externalStorage.tooltip": "Configuration for the External Storage.", "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage.tooltip": "The energy used by the External Storage.", "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.tooltip": "Configuration for the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity.tooltip": "The energy capacity of the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage.tooltip": "The energy used by the Wireless Grid to open.", "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage.tooltip": "The energy used by the Wireless Grid to insert resources.", "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage.tooltip": "The energy used by the Wireless Grid to extract resources.", "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.tooltip": "Configuration for the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage.tooltip": "The energy used by the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange.tooltip": "The base range of the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.tooltip": "Configuration for the Storage Monitor.", "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage.tooltip": "The energy used by the Storage Monitor.", "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.tooltip": "Configuration for the Network Receiver.", "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage.tooltip": "The energy used by the Network Receiver.", "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.tooltip": "Configuration for the Network Transmitter.", "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage.tooltip": "The energy used by the Network Transmitter.", "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.tooltip": "Configuration for the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity.tooltip": "The energy capacity of the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage.tooltip": "The energy used by the Portable Grid to open.", "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage.tooltip": "The energy used by the Portable Grid to insert resources.", "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage.tooltip": "The energy used by the Portable Grid to extract resources.", "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.tooltip": "Configuration for the Security Card.", "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage.tooltip": "The energy used by the Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.tooltip": "Configuration for the Fallback Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage.tooltip": "The energy used by the Fallback Security Card.", "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.tooltip": "Configuration for the Security Manager.", "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage.tooltip": "The energy used by the Security Manager.", "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.tooltip": "Configuration for the Relay.", "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage.tooltip": "Input network energy usage.", "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage.tooltip": "Output network energy usage (if not in pass through mode).", "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", "advancements.refinedstorage.connecting": "Connecting", "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", From 6cb51c1858dd34cf3b09ed5f498852fa475f90c9 Mon Sep 17 00:00:00 2001 From: Raoul Date: Sun, 21 Jul 2024 01:32:09 +0200 Subject: [PATCH 23/36] chore: update translation Portuguese, Brazilian from crowdin --- .../assets/refinedstorage/lang/pt_br.json | 100 +++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/pt_br.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/pt_br.json index 6ccc338a8..f53a35996 100644 --- a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/pt_br.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/pt_br.json @@ -302,6 +302,7 @@ "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", + "key.refinedstorage.open_portable_grid": "Open Portable Grid", "refinedstorage.subtitle.wrench": "Wrench used", "permission.refinedstorage.insert": "Insert", "permission.refinedstorage.insert.description": "Whether the player can insert resources in a network.", @@ -334,99 +335,194 @@ "tag.item.refinedstorage.storage_disks": "Storage Disks", "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.title": "Refined Storage Configuration", + "refinedstorage.configuration.title": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml.title": "Refined Storage Configuration", "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.smoothScrolling.tooltip": "Whether scrollbars should use smooth scrolling.", "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.screenSize.tooltip": "The screen size.", "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.maxRowsStretch.tooltip": "The maximum amount of rows that can be displayed when the screen size is stretched.", "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.tooltip": "Configuration for the Grid.", "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.largeFont.tooltip": "Whether the Grid should use a large font for quantities.", "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown.tooltip": "Whether the Grid should avoid sorting when shift is held down.", "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip.tooltip": "Whether the Grid should show a detailed tooltip.", "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery.tooltip": "Whether the search query should persist when closing and re-opening the Grid.", "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.energyUsage.tooltip": "The energy used by the Grid.", "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.autoSelected.tooltip": "Whether the search box should be auto-selected when opening the Grid.", "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.synchronizer.tooltip": "The synchronization type of the Grid search box.", + "text.autoconfig.refinedstorage.option.grid.resourceType": "Resource type", + "text.autoconfig.refinedstorage.option.grid.resourceType.tooltip": "The resource type to be shown.", "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sorting direction", + "text.autoconfig.refinedstorage.option.grid.sortingDirection.tooltip": "The sorting direction.", "text.autoconfig.refinedstorage.option.grid.sortingType": "Sorting type", + "text.autoconfig.refinedstorage.option.grid.sortingType.tooltip": "The sorting type.", "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.tooltip": "Configuration for the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage.tooltip": "The energy used by the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior.tooltip": "What should happen to the crafting matrix slots when closing the Crafting Grid.", "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.tooltip": "Configuration for the Controller.", "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.controller.energyCapacity.tooltip": "The energy capacity of the Controller.", "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.tooltip": "Configuration for the Cable.", "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.cable.energyUsage.tooltip": "The energy used by the Cable.", "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.tooltip": "Configuration for the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage.tooltip": "The energy used by the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.tooltip": "Configuration for the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage.tooltip": "The energy used by the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.tooltip": "Configuration for the Storage Blocks.", "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage.tooltip": "The energy used by the 1K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage.tooltip": "The energy used by the 4K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage.tooltip": "The energy used by the 16K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage.tooltip": "The energy used by the 64K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.tooltip": "Configuration for the Fluid Storage Blocks.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage.tooltip": "The energy used by the 64B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage.tooltip": "The energy used by the 256B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage.tooltip": "The energy used by the 1024B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage.tooltip": "The energy used by the 4096B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Fluid Storage Block.", "text.autoconfig.refinedstorage.option.importer": "Importer", + "text.autoconfig.refinedstorage.option.importer.tooltip": "Configuration for the Importer.", "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.importer.energyUsage.tooltip": "The energy used by the Importer.", "text.autoconfig.refinedstorage.option.exporter": "Exporter", + "text.autoconfig.refinedstorage.option.exporter.tooltip": "Configuration for the Exporter.", "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter.energyUsage.tooltip": "The energy used by the Exporter.", "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.tooltip": "Configuration for the Detector.", "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector.energyUsage.tooltip": "The energy used by the Detector.", "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.tooltip": "Configuration for the Constructor.", "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor.energyUsage.tooltip": "The energy used by the Constructor.", "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.tooltip": "Configuration for the Destructor.", "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor.energyUsage.tooltip": "The energy used by the Destructor.", "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.tooltip": "Configuration for the Upgrades.", "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage.tooltip": "The additional energy used per Speed Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage.tooltip": "The additional energy used by the Stack Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 1 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 2 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 3 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage.tooltip": "The additional energy used by the Silk Touch Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage.tooltip": "The additional energy used by the Regulator Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage.tooltip": "The additional energy used per Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage.tooltip": "The additional energy used by the Creative Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange.tooltip": "The additional range provided by the Range Upgrade.", "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.tooltip": "Configuration for the Interface.", "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.iface.energyUsage.tooltip": "The energy used by the Interface.", "text.autoconfig.refinedstorage.option.externalStorage": "External Storage", + "text.autoconfig.refinedstorage.option.externalStorage.tooltip": "Configuration for the External Storage.", "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage.tooltip": "The energy used by the External Storage.", "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.tooltip": "Configuration for the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity.tooltip": "The energy capacity of the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage.tooltip": "The energy used by the Wireless Grid to open.", "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage.tooltip": "The energy used by the Wireless Grid to insert resources.", "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage.tooltip": "The energy used by the Wireless Grid to extract resources.", "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.tooltip": "Configuration for the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage.tooltip": "The energy used by the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange.tooltip": "The base range of the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.tooltip": "Configuration for the Storage Monitor.", "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage.tooltip": "The energy used by the Storage Monitor.", "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.tooltip": "Configuration for the Network Receiver.", "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage.tooltip": "The energy used by the Network Receiver.", "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.tooltip": "Configuration for the Network Transmitter.", "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage.tooltip": "The energy used by the Network Transmitter.", "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.tooltip": "Configuration for the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity.tooltip": "The energy capacity of the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage.tooltip": "The energy used by the Portable Grid to open.", "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage.tooltip": "The energy used by the Portable Grid to insert resources.", "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage.tooltip": "The energy used by the Portable Grid to extract resources.", "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.tooltip": "Configuration for the Security Card.", "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage.tooltip": "The energy used by the Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.tooltip": "Configuration for the Fallback Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage.tooltip": "The energy used by the Fallback Security Card.", "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.tooltip": "Configuration for the Security Manager.", "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage.tooltip": "The energy used by the Security Manager.", "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.tooltip": "Configuration for the Relay.", "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage.tooltip": "Input network energy usage.", "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage.tooltip": "Output network energy usage (if not in pass through mode).", "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", "advancements.refinedstorage.connecting": "Connecting", "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", From 8374b72e464b7fa21b36790f6b5fd48841fa11f1 Mon Sep 17 00:00:00 2001 From: Raoul Date: Sun, 21 Jul 2024 01:32:10 +0200 Subject: [PATCH 24/36] chore: update translation Indonesian from crowdin --- .../assets/refinedstorage/lang/id_id.json | 100 +++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/id_id.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/id_id.json index b01e02486..4c58839c8 100644 --- a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/id_id.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/id_id.json @@ -302,6 +302,7 @@ "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Singkirkan matriks Kisi Kerajinan ke jaringan", "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Singkirkan matriks Kisi Kerajinan ke inventaris", "key.refinedstorage.open_wireless_grid": "Buka Kisi Nirkabel", + "key.refinedstorage.open_portable_grid": "Open Portable Grid", "refinedstorage.subtitle.wrench": "Kunci inggris digunakan", "permission.refinedstorage.insert": "Insert", "permission.refinedstorage.insert.description": "Whether the player can insert resources in a network.", @@ -334,99 +335,194 @@ "tag.item.refinedstorage.storage_disks": "Storage Disks", "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.title": "Refined Storage Configuration", + "refinedstorage.configuration.title": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml": "Refined Storage Configuration", + "refinedstorage.configuration.section.refinedstorage.common.toml.title": "Refined Storage Configuration", "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.smoothScrolling.tooltip": "Whether scrollbars should use smooth scrolling.", "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.screenSize.tooltip": "The screen size.", "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.maxRowsStretch.tooltip": "The maximum amount of rows that can be displayed when the screen size is stretched.", "text.autoconfig.refinedstorage.option.grid": "Kisi", + "text.autoconfig.refinedstorage.option.grid.tooltip": "Configuration for the Grid.", "text.autoconfig.refinedstorage.option.grid.largeFont": "Font besar", + "text.autoconfig.refinedstorage.option.grid.largeFont.tooltip": "Whether the Grid should use a large font for quantities.", "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Mencegah pengurutan ketika SHIFT ditekan", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown.tooltip": "Whether the Grid should avoid sorting when shift is held down.", "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detail teks keterangan", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip.tooltip": "Whether the Grid should show a detailed tooltip.", "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Ingat permintaan pencarian", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery.tooltip": "Whether the search query should persist when closing and re-opening the Grid.", "text.autoconfig.refinedstorage.option.grid.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.grid.energyUsage.tooltip": "The energy used by the Grid.", "text.autoconfig.refinedstorage.option.grid.autoSelected": "Memilih otomatis kotak pencarian", + "text.autoconfig.refinedstorage.option.grid.autoSelected.tooltip": "Whether the search box should be auto-selected when opening the Grid.", "text.autoconfig.refinedstorage.option.grid.synchronizer": "Sinkronisasi", - "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Jenis sumber daya", + "text.autoconfig.refinedstorage.option.grid.synchronizer.tooltip": "The synchronization type of the Grid search box.", + "text.autoconfig.refinedstorage.option.grid.resourceType": "Resource type", + "text.autoconfig.refinedstorage.option.grid.resourceType.tooltip": "The resource type to be shown.", "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Arah Pengurutan", + "text.autoconfig.refinedstorage.option.grid.sortingDirection.tooltip": "The sorting direction.", "text.autoconfig.refinedstorage.option.grid.sortingType": "Jenis pengurutan", + "text.autoconfig.refinedstorage.option.grid.sortingType.tooltip": "The sorting type.", "text.autoconfig.refinedstorage.option.craftingGrid": "Kisi Kerajinan", + "text.autoconfig.refinedstorage.option.craftingGrid.tooltip": "Configuration for the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage.tooltip": "The energy used by the Crafting Grid.", "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Perilaku menutup Matriks kerajinan", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior.tooltip": "What should happen to the crafting matrix slots when closing the Crafting Grid.", "text.autoconfig.refinedstorage.option.controller": "Pengendali", + "text.autoconfig.refinedstorage.option.controller.tooltip": "Configuration for the Controller.", "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Kapasitas daya", + "text.autoconfig.refinedstorage.option.controller.energyCapacity.tooltip": "The energy capacity of the Controller.", "text.autoconfig.refinedstorage.option.cable": "Kabel", + "text.autoconfig.refinedstorage.option.cable.tooltip": "Configuration for the Cable.", "text.autoconfig.refinedstorage.option.cable.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.cable.energyUsage.tooltip": "The energy used by the Cable.", "text.autoconfig.refinedstorage.option.diskDrive": "Lemari Cakram", + "text.autoconfig.refinedstorage.option.diskDrive.tooltip": "Configuration for the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage.tooltip": "The energy used by the Disk Drive.", "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Pemakaian daya per cakram", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.tooltip": "Configuration for the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage.tooltip": "The energy used by the Disk Interface.", "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk.tooltip": "The energy used per disk.", "text.autoconfig.refinedstorage.option.storageBlock": "Balok Penyimpanan", + "text.autoconfig.refinedstorage.option.storageBlock.tooltip": "Configuration for the Storage Blocks.", "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "Pemakaian daya 1K", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage.tooltip": "The energy used by the 1K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "Pemakaian daya 4K", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage.tooltip": "The energy used by the 4K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "Pemakaian daya 16K", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage.tooltip": "The energy used by the 16K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "Pemakaian daya 64K", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage.tooltip": "The energy used by the 64K Storage Block.", "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Pemakaian daya kreatif", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Balok Penyimpanan Cairan", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.tooltip": "Configuration for the Fluid Storage Blocks.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "Pemakaian daya 64M", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage.tooltip": "The energy used by the 64B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "Pemakaian daya 256M", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage.tooltip": "The energy used by the 256B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "Pemakaian daya 1024M", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage.tooltip": "The energy used by the 1024B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "Pemakaian daya 4096M", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage.tooltip": "The energy used by the 4096B Fluid Storage Block.", "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Pemakaian daya kreatif", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage.tooltip": "The energy used by the Creative Fluid Storage Block.", "text.autoconfig.refinedstorage.option.importer": "Importir", + "text.autoconfig.refinedstorage.option.importer.tooltip": "Configuration for the Importer.", "text.autoconfig.refinedstorage.option.importer.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.importer.energyUsage.tooltip": "The energy used by the Importer.", "text.autoconfig.refinedstorage.option.exporter": "Eksportir", + "text.autoconfig.refinedstorage.option.exporter.tooltip": "Configuration for the Exporter.", "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.exporter.energyUsage.tooltip": "The energy used by the Exporter.", "text.autoconfig.refinedstorage.option.detector": "Pendeteksi", + "text.autoconfig.refinedstorage.option.detector.tooltip": "Configuration for the Detector.", "text.autoconfig.refinedstorage.option.detector.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.detector.energyUsage.tooltip": "The energy used by the Detector.", "text.autoconfig.refinedstorage.option.constructor": "Pembangun", + "text.autoconfig.refinedstorage.option.constructor.tooltip": "Configuration for the Constructor.", "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.constructor.energyUsage.tooltip": "The energy used by the Constructor.", "text.autoconfig.refinedstorage.option.destructor": "Penghancur", + "text.autoconfig.refinedstorage.option.destructor.tooltip": "Configuration for the Destructor.", "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.destructor.energyUsage.tooltip": "The energy used by the Destructor.", "text.autoconfig.refinedstorage.option.upgrade": "Peningkatan", + "text.autoconfig.refinedstorage.option.upgrade.tooltip": "Configuration for the Upgrades.", "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Pemakaian daya peningkat kecepatan", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage.tooltip": "The additional energy used per Speed Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Pemakaian daya peningkat tumpukan", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage.tooltip": "The additional energy used by the Stack Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Pemakaian daya peningkat peruntungan 1", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 1 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Pemakaian daya peningkat peruntungan 2", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 2 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Pemakaian daya peningkat peruntungan 3", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage.tooltip": "The additional energy used by the Fortune 3 Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Pemakaian daya peningkat sentuhan sutra", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage.tooltip": "The additional energy used by the Silk Touch Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Pemakaian daya peningkat pengatur", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage.tooltip": "The additional energy used by the Regulator Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Pemakaian daya peningkat jangkauan", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage.tooltip": "The additional energy used per Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Pemakaian daya peningkat jangkauan kreatif", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage.tooltip": "The additional energy used by the Creative Range Upgrade.", "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Rentang Peningkatan Jangkauan", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange.tooltip": "The additional range provided by the Range Upgrade.", "text.autoconfig.refinedstorage.option.iface": "Antarmuka", + "text.autoconfig.refinedstorage.option.iface.tooltip": "Configuration for the Interface.", "text.autoconfig.refinedstorage.option.iface.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.iface.energyUsage.tooltip": "The energy used by the Interface.", "text.autoconfig.refinedstorage.option.externalStorage": "Penyimpanan Eksternal", + "text.autoconfig.refinedstorage.option.externalStorage.tooltip": "Configuration for the External Storage.", "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage.tooltip": "The energy used by the External Storage.", "text.autoconfig.refinedstorage.option.wirelessGrid": "Kisi Nirkabel", + "text.autoconfig.refinedstorage.option.wirelessGrid.tooltip": "Configuration for the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Kapasitas energi", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity.tooltip": "The energy capacity of the Wireless Grid.", "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Buka pemakaian daya", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage.tooltip": "The energy used by the Wireless Grid to open.", "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Masukkan pemakaian daya", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage.tooltip": "The energy used by the Wireless Grid to insert resources.", "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Ekstrak pemakaian daya", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage.tooltip": "The energy used by the Wireless Grid to extract resources.", "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Pemancar Nirkabel", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.tooltip": "Configuration for the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage.tooltip": "The energy used by the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Jangkauan Dasar", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange.tooltip": "The base range of the Wireless Transmitter.", "text.autoconfig.refinedstorage.option.storageMonitor": "Monitor Penyimpanan", + "text.autoconfig.refinedstorage.option.storageMonitor.tooltip": "Configuration for the Storage Monitor.", "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage.tooltip": "The energy used by the Storage Monitor.", "text.autoconfig.refinedstorage.option.networkReceiver": "Penerima Jaringan", + "text.autoconfig.refinedstorage.option.networkReceiver.tooltip": "Configuration for the Network Receiver.", "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage.tooltip": "The energy used by the Network Receiver.", "text.autoconfig.refinedstorage.option.networkTransmitter": "Pemancar Jaringan", + "text.autoconfig.refinedstorage.option.networkTransmitter.tooltip": "Configuration for the Network Transmitter.", "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage.tooltip": "The energy used by the Network Transmitter.", "text.autoconfig.refinedstorage.option.portableGrid": "Kisi Portabel", + "text.autoconfig.refinedstorage.option.portableGrid.tooltip": "Configuration for the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Kapasitas energi", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity.tooltip": "The energy capacity of the Portable Grid.", "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Buka pemakaian daya", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage.tooltip": "The energy used by the Portable Grid to open.", "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Masukkan pemakaian daya", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage.tooltip": "The energy used by the Portable Grid to insert resources.", "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Ekstrak pemakaian daya", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage.tooltip": "The energy used by the Portable Grid to extract resources.", "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.tooltip": "Configuration for the Security Card.", "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage.tooltip": "The energy used by the Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.tooltip": "Configuration for the Fallback Security Card.", "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage.tooltip": "The energy used by the Fallback Security Card.", "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.tooltip": "Configuration for the Security Manager.", "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage.tooltip": "The energy used by the Security Manager.", "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.tooltip": "Configuration for the Relay.", "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage.tooltip": "Input network energy usage.", "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage.tooltip": "Output network energy usage (if not in pass through mode).", "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", "advancements.refinedstorage.connecting": "Menyambungkan", "advancements.refinedstorage.connecting.description": "Gunakan Kabel untuk menghubungkan perangkat satu sama lain, atau letakkan perangkat melawan satu sama lain", From a94bf00e91d2f0a7c5958050409bd47e4c84e9c2 Mon Sep 17 00:00:00 2001 From: Raoul Date: Sun, 21 Jul 2024 01:32:11 +0200 Subject: [PATCH 25/36] chore: update translation Turkish from crowdin --- .../assets/refinedstorage/lang/tr_tr.json | 569 ++++++++++++++++++ 1 file changed, 569 insertions(+) create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/tr_tr.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/tr_tr.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/tr_tr.json new file mode 100644 index 000000000..976dd8177 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/tr_tr.json @@ -0,0 +1,569 @@ +{ + "mod.refinedstorage": "Refined Storage", + "block.refinedstorage.cable": "Kablo", + "block.refinedstorage.quartz_enriched_iron_block": "Kuvarsla Zenginleştirilmiş Demir Bloğu", + "block.refinedstorage.quartz_enriched_copper_block": "Kuvarsla Zenginleştirilmiş Bakır Bloğu", + "block.refinedstorage.disk_drive": "Disk Sürücüsü", + "block.refinedstorage.machine_casing": "Makine Muhafazası", + "block.refinedstorage.grid": "Terminal", + "block.refinedstorage.crafting_grid": "Üretim Terminali", + "block.refinedstorage.controller": "Denetleyici", + "block.refinedstorage.creative_controller": "Yaratıcı Mod Denetleyici", + "block.refinedstorage.1k_storage_block": "1K Depolama Bloğu", + "block.refinedstorage.4k_storage_block": "4K Depolama Bloğu", + "block.refinedstorage.16k_storage_block": "16K Depolama Bloğu", + "block.refinedstorage.64k_storage_block": "64K Depolama Bloğu", + "block.refinedstorage.creative_storage_block": "Yaratıcı Mod Depolama Bloğu", + "block.refinedstorage.64b_fluid_storage_block": "64B Akışkan Depolama Bloğu", + "block.refinedstorage.256b_fluid_storage_block": "256B Akışkan Depolama Bloğu", + "block.refinedstorage.1024b_fluid_storage_block": "1024B Akışkan Depolama Bloğu", + "block.refinedstorage.4096b_fluid_storage_block": "4096B Akışkan Depolama Bloğu", + "block.refinedstorage.creative_fluid_storage_block": "Yaratıcı Mod Akışkan Depolama Bloğu", + "block.refinedstorage.importer": "İçe Aktarıcı", + "block.refinedstorage.exporter": "Dışarıya Aktarıcı", + "block.refinedstorage.interface": "Arayüz", + "block.refinedstorage.external_storage": "Harici Depo", + "block.refinedstorage.detector": "Dedektör", + "block.refinedstorage.constructor": "Yapıcı", + "block.refinedstorage.destructor": "Yıkıcı", + "block.refinedstorage.wireless_transmitter": "Kablosuz Verici", + "block.refinedstorage.storage_monitor": "Depolama Monitörü", + "block.refinedstorage.network_receiver": "Ağ Alıcısı", + "block.refinedstorage.network_transmitter": "Ağ Vericisi", + "block.refinedstorage.portable_grid": "Taşınabilir Terminal", + "block.refinedstorage.creative_portable_grid": "Yaratıcı Mod Taşınabilir Terminal", + "block.refinedstorage.security_manager": "Güvenlik Yöneticisi", + "block.refinedstorage.security_manager.help": "Bu cihaz aktif olduğunda, varsayılan olarak ağı koruyacak ve tüm işlemleri engelleyecektir. Bir oyuncu için belirli işlemlere izin vermek veya reddetmek için Güvenlik Kartları eklemeye başlayın.", + "block.refinedstorage.relay": "Röle", + "block.refinedstorage.disk_interface": "Disk Arayüzü", + "gui.refinedstorage.controller.redstone_mode_help": "Bu cihaz etkin olmadığında, depolama ağı bu cihazı enerji kaynağı olarak kullanamayacaktır.", + "gui.refinedstorage.disk_drive.disks": "Diskler", + "gui.refinedstorage.storage.redstone_mode_help": "Bu cihaz etkin olmadığında, içerdiği depolama alanına depolama ağı içinden erişilemeyecektir.", + "gui.refinedstorage.storage.filter_help": "Cihazın izin listesi veya engel listesi modunda olmasına bağlı olarak, bu depolama alanında izin verilebilecek veya verilmeyebilecek kaynaklar.", + "gui.refinedstorage.storage.filter_mode.empty_warning": "Yapılandırılmış herhangi bir filtre olmadan, bu depolama alanına hiçbir kaynak kabul edilmeyecektir.", + "gui.refinedstorage.storage.filter_mode.allow.help": "Yalnızca filtrelerde yapılandırılan kaynakların bu depolama alanına girmesine izin ver.", + "gui.refinedstorage.storage.filter_mode.block.help": "Filtrelerde yapılandırılan kaynakların bu depolama alanına girmesine izin verme.", + "gui.refinedstorage.grid.sorting.direction": "Sıralama yönü", + "gui.refinedstorage.grid.sorting.direction.ascending": "Artan", + "gui.refinedstorage.grid.sorting.direction.descending": "Azalan", + "gui.refinedstorage.grid.sorting.type": "Sıralama türü", + "gui.refinedstorage.grid.sorting.type.quantity": "Miktar", + "gui.refinedstorage.grid.sorting.type.name": "Ad", + "gui.refinedstorage.grid.sorting.type.id": "ID", + "gui.refinedstorage.grid.sorting.type.last_modified": "Son düzenleme", + "gui.refinedstorage.grid.auto_selected": "Otomatik seçili", + "gui.refinedstorage.grid.auto_selected.help": "Terminal açılırken arama kutusunun otomatik olarak seçilip seçilmeyeceği.", + "gui.refinedstorage.grid.synchronizer": "Senkronizasyon modu", + "gui.refinedstorage.grid.synchronizer.off": "Kapalı", + "gui.refinedstorage.grid.synchronizer.off.help": "Arama kutusu metnini senkronize etme.", + "gui.refinedstorage.grid.resource_type": "Kaynak türü", + "gui.refinedstorage.grid.resource_type.all": "Hepsi", + "gui.refinedstorage.grid.resource_type.help": "Belirli kaynak türlerini filtreleyin.", + "gui.refinedstorage.crafting_grid.move.network": "Eşyaları ağa taşı", + "gui.refinedstorage.crafting_grid.move.inventory": "Eşyaları envantere taşı", + "gui.refinedstorage.screen_size": "Ekran boyutu", + "gui.refinedstorage.screen_size.stretch": "Esnet", + "gui.refinedstorage.screen_size.small": "Küçük", + "gui.refinedstorage.screen_size.medium": "Orta", + "gui.refinedstorage.screen_size.large": "Büyük", + "gui.refinedstorage.screen_size.extra_large": "Çok büyük", + "gui.refinedstorage.detector.mode": "Mod", + "gui.refinedstorage.detector.mode.under": "Miktarın altında olduğunda redstone sinyali yayınla", + "gui.refinedstorage.detector.mode.equal": "İstenilen miktara gelindiğinde redstone sinyali yayınla", + "gui.refinedstorage.detector.mode.above": "Miktarın üzerinde olduğunda redstone sinyali yayınla", + "gui.refinedstorage.detector.filter_help": "Depolama ağında tespit edilmesi gereken kaynak.", + "gui.refinedstorage.destructor.pickup_items": "Eşyaları kırmak yerine toplar", + "gui.refinedstorage.destructor.filter_help": "Cihazın, izin listesi veya engel listesi modunda olmasına bağlı olarak yok edilebilecek veya yok edilemeyecek bloklar.", + "gui.refinedstorage.destructor.filter_mode.allow.help": "Depolama ağına, yalnızca filtrelerde yapılandırılmış blokların girmesine izin ver.", + "gui.refinedstorage.destructor.filter_mode.block.help": "Depolama ağına, filtrelerde yapılandırılmış blokların girmesine izin verme.", + "gui.refinedstorage.constructor.drop_items": "Blok yerleştirmek yerine eşyaları bırakır", + "gui.refinedstorage.constructor.filter_help": "Depolama ağından yerleştirilmesi gereken kaynaklar.", + "gui.refinedstorage.interface.filter_help": "Depolama ağından dışarı aktarılması gereken kaynaklar.", + "gui.refinedstorage.exporter.filter_help": "Depolama ağından dışarı aktarılması gereken kaynaklar.", + "gui.refinedstorage.importer.filter_help": "Hedef envanterden içe aktarılabilecek kaynaklar.", + "gui.refinedstorage.importer.filter_mode.allow.help": "Yalnızca filtrelerde yapılandırılmış kaynakların depolama ağına girmesine izin ver.", + "gui.refinedstorage.importer.filter_mode.block.help": "Filtrelerde yapılandırılmış kaynakların depolama ağına girmesine izin verme.", + "gui.refinedstorage.wireless_transmitter.distance": "%d blok", + "gui.refinedstorage.storage_monitor.filter_help": "Görüntülenecek kaynak.", + "gui.refinedstorage.redstone_mode": "Redstone modu", + "gui.refinedstorage.redstone_mode.ignore": "Yoksay", + "gui.refinedstorage.redstone_mode.ignore.help": "Bu cihaz redstone sinyalinden bağımsız olarak her zaman aktif olacaktır.", + "gui.refinedstorage.redstone_mode.high": "Yüksek", + "gui.refinedstorage.redstone_mode.high.help": "Bu cihaz yalnızca redstone sinyaliyle etkinleşecektir.", + "gui.refinedstorage.redstone_mode.low": "Düşük", + "gui.refinedstorage.redstone_mode.low.help": "Bu cihaz yalnızca redstone sinyali olmadan etkinleşecektir.", + "gui.refinedstorage.scheduling_mode": "Sıralama modu", + "gui.refinedstorage.scheduling_mode.default": "Varsayılan", + "gui.refinedstorage.scheduling_mode.default.help": "Müsait olan ilk filtreyi kullan.", + "gui.refinedstorage.scheduling_mode.round_robin": "Sırayla", + "gui.refinedstorage.scheduling_mode.round_robin.help": "Her filtreyi sırayla kullan.", + "gui.refinedstorage.scheduling_mode.random": "Rastgele", + "gui.refinedstorage.scheduling_mode.random.help": "Rastgele bir filtreyi kullan.", + "gui.refinedstorage.priority": "Öncelik", + "gui.refinedstorage.priority.storage_help": "Depolama ağının kaynakları ekleyeceği veya çıkaracağı sıra, en yüksek-ilk.", + "gui.refinedstorage.amount": "Miktar", + "gui.refinedstorage.amount.reset": "Sıfırla", + "gui.refinedstorage.amount.set": "Ayarla", + "gui.refinedstorage.filter_mode": "Filtre modu", + "gui.refinedstorage.filter_mode.allow": "İzin Listesi", + "gui.refinedstorage.filter_mode.block": "Engel Listesi", + "gui.refinedstorage.fuzzy_mode": "Belirsiz Mod", + "gui.refinedstorage.fuzzy_mode.on": "Açık", + "gui.refinedstorage.fuzzy_mode.on.storage_help": "İzin listesi veya engel listesi için filtreleri tam olarak eşleştir.", + "gui.refinedstorage.fuzzy_mode.on.generic_help": "Filtreyi tam olarak eşleştir.", + "gui.refinedstorage.fuzzy_mode.on.extracting_storage_network_help": "Depolama ağından çıkarırken filtreleri tam olarak eşleştir.", + "gui.refinedstorage.fuzzy_mode.on.extracting_source_help": "Kaynaktan çıkarırken filtreleri tam olarak eşleştir.", + "gui.refinedstorage.fuzzy_mode.off": "Kapalı", + "gui.refinedstorage.fuzzy_mode.off.storage_help": "NBT etiketlerini karşılaştırmadan izin listesi veya engel listesi için filtreleri eşleştir.", + "gui.refinedstorage.fuzzy_mode.off.generic_help": "NBT etiketlerini karşılaştırmadan filtreyi eşleştir.", + "gui.refinedstorage.fuzzy_mode.off.extracting_storage_network_help": "NBT etiketlerini karşılaştırmadan depolama ağından çıkarırken filtreleri eşleştir.", + "gui.refinedstorage.fuzzy_mode.off.extracting_source_help": "NBT etiketlerini karşılaştırmadan kaynaktan çıkarırken filtreleri eşleştir.", + "gui.refinedstorage.access_mode": "Erişim modu", + "gui.refinedstorage.access_mode.insert_extract": "Ekle ve çıkar", + "gui.refinedstorage.access_mode.insert_extract.help": "Depolama ağı, bu depoya ekleme veya çıkarma yapabilecektir.", + "gui.refinedstorage.access_mode.insert": "Yalnızca ekle", + "gui.refinedstorage.access_mode.insert.help": "Depolama ağı, yalnızca bu depoya ekleme yapabilecektir. Depolanan kaynaklar Terminal'de görünür olmaya devam edecektir.", + "gui.refinedstorage.access_mode.extract": "Yalnızca çıkar", + "gui.refinedstorage.access_mode.extract.help": "Depolama ağı, yalnızca bu depodan çıkarma yapabilecektir.", + "gui.refinedstorage.void_excess": "Fazla kaynakları geçersiz kıl", + "gui.refinedstorage.void_excess.help": "Fazla kaynakları geçersiz kıl modu açıldığında ve depolama alanı dolduğunda, kaynakları kabul etmeye devam edecek ancak onları geçersiz kılacaktır.", + "gui.refinedstorage.void_excess.allowlist_warning": "Fazlalığı geçersiz kıl modu yalnızca depolama, izin listesi modundayken çalışacaktır.", + "gui.refinedstorage.upgrade_slot": "Boş yükseltme yuvası", + "gui.refinedstorage.filter_slot.empty_filter": "Boş filtre", + "gui.refinedstorage.filter_slot.left_click_for": "Şunun için Sol tıkla", + "gui.refinedstorage.filter_slot.right_click_for": "Şunun için Sağ tıkla", + "gui.refinedstorage.filter_slot.click_to_clear": "Temizlemek için tıkla", + "gui.refinedstorage.regulator_upgrade.filter_help": "Hedefte düzenlenmesi gereken kaynak.", + "gui.refinedstorage.network_transmitter.status.inactive": "Etkin Değil", + "gui.refinedstorage.network_transmitter.status.missing_network_card": "Ağ Kartı Eksik", + "gui.refinedstorage.network_transmitter.status.transmitting": "%d blok", + "gui.refinedstorage.network_transmitter.status.receiver_unreachable": "Erişilemiyor", + "gui.refinedstorage.security_card.permission.reset": "Sıfırla", + "gui.refinedstorage.security_card.permission.modified": "Değiştirilmiş", + "gui.refinedstorage.security_manager.redstone_mode_help": "Bu cihaz etkin olmadığında, ağ korunmayacaktır.", + "gui.refinedstorage.security_manager.fallback_security_card_slot_hint": "Yedek Güvenlik Kartı için Yuva.", + "gui.refinedstorage.security_manager.no_fallback_security_card_consequence": "Güvenlik Kartı olmadan her oyuncunun izinlerini ayarlamak için bu yuvaya bir Yedek Güvenlik Kartı ekleyin. Varsayılan olarak, tüm eylemler reddedilir.", + "gui.refinedstorage.relay.filter_help": "Röle, doğrudan geçiş modunda değilse giriş ağından çıkış ağına maruz bırakılması gereken kaynaklar.", + "gui.refinedstorage.relay.pass_through": "Doğrudan geçiş", + "gui.refinedstorage.relay.pass_through.help": "Bu cihazın tüm giriş ağı sinyalini olduğu gibi geçirmesi gerekip gerekmediği. Bileşenleri çıkış ağına seçici olarak maruz bırakmak için bunu kapatın.", + "gui.refinedstorage.relay.pass_energy": "Enerjiyi geçir", + "gui.refinedstorage.relay.pass_energy.help": "Bu cihazın kısa süreli toplanmış enerjiyi giriş ağından çıkış ağına geçirip geçirmeyeceği.", + "gui.refinedstorage.relay.pass_storage": "Depoyu geçir", + "gui.refinedstorage.relay.pass_storage.help": "Bu cihazın depolamayı giriş ağından çıkış ağına geçirmesi gerekip gerekmediği.", + "gui.refinedstorage.relay.pass_security": "Güvenliği geçir", + "gui.refinedstorage.relay.pass_security.help": "Bu cihazın güvenlik ayarlarını giriş ağından çıkış ağına geçirmesi gerekip gerekmediği.", + "gui.refinedstorage.relay.filter_mode.allow.help": "Yalnızca filtrelerde yapılandırılmış olan kaynakları giriş ağından çıkış ağına maruz bırakın.", + "gui.refinedstorage.relay.filter_mode.block.help": "Filtrelerde yapılandırılmış olan kaynakları giriş ağından çıkış ağına maruz bırakmayın.", + "gui.refinedstorage.disk_interface.filter_mode.allow.help": "Yalnızca filtrelerde yapılandırılan kaynakların depolama disklerine veya ağa girmesine izin ver.", + "gui.refinedstorage.disk_interface.filter_mode.block.help": "Filtrelerde yapılandırılan kaynakların depolama disklerine veya ağa girmesine izin verme.", + "gui.refinedstorage.disk_interface.in": "Giriş", + "gui.refinedstorage.disk_interface.out": "Çıkış", + "gui.refinedstorage.disk_interface.filter_help": "Cihazın izin listesi veya engel listesi modunda olmasına bağlı olarak, sağlanan depolama disklerinden veya bu disklere aktarılmasına izin verilebilecek veya verilmeyebilecek kaynaklar.", + "gui.refinedstorage.disk_interface.transfer_mode": "Aktarım modu", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network": "Ağa ekle", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network.help": "Kaynakları, depolama disklerinden depolama ağına yerleştirin.", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network": "Ağdan çıkar", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network.help": "Kaynakları, depolama ağından depolama disklerine yerleştirin.", + "item.refinedstorage.controller.help": "Depolama ağına enerji sağlar. Tek bir depolama ağında birden fazlasına izin verilir.", + "item.refinedstorage.creative_controller.help": "Depolama ağına sonsuz enerji sağlar.", + "item.refinedstorage.disk_drive.help": "Depolama ağına, depolama alanı sağlamak için depolama disklerini kabul eder.", + "item.refinedstorage.disk_interface.help": "Kaynakları, depolama ağı ve sağlanan depolama diskleri arasında aktarır.", + "item.refinedstorage.grid.help": "Depolama ağı ile etkileşime girmeye izin verir.", + "item.refinedstorage.crafting_grid.help": "Üretim yetenekleri ile depolama ağına etkileşime izin verir.", + "item.refinedstorage.importer.help": "Kaynakları, harici bir kaynaktan depolama ağına aktarır.", + "item.refinedstorage.exporter.help": "Kaynakları, depolama ağından harici bir hedefe aktarır.", + "item.refinedstorage.interface.help": "İçe Aktarıcı ve Dışarıya Aktarıcı'nın birleşimi olarak davranır.", + "item.refinedstorage.external_storage.help": "Depolama ağına harici bir kaynaktan depolama alanı sağlar.", + "item.refinedstorage.detector.help": "Eğer depolama ağı verilen miktarın üstünde, altında veya eşit bir kaynak içeriyorsa bir redstone sinyali yayar.", + "item.refinedstorage.constructor.help": "Depolama ağındaki blokları dünyaya yerleştirir.", + "item.refinedstorage.destructor.help": "Dünyadaki blokları yok eder ve depolama ağına yerleştirir.", + "item.refinedstorage.relay.help": "Bir depolama ağının tüm bölümlerini açın veya kapatın ve ağınızın yeni dallarını oluşturun.", + "item.refinedstorage.quartz_enriched_iron": "Kuvarsla Zenginleştirilmiş Demir", + "item.refinedstorage.quartz_enriched_copper": "Kuvarsla Zenginleştirilmiş Bakır", + "item.refinedstorage.processor_binding": "İşlemci Bağlayıcısı", + "item.refinedstorage.silicon": "Silikon", + "item.refinedstorage.raw_basic_processor": "Ham Temel İşlemci", + "item.refinedstorage.raw_improved_processor": "Ham İyileştirilmiş İşlemci", + "item.refinedstorage.raw_advanced_processor": "Ham Gelişmiş İşlemci", + "item.refinedstorage.basic_processor": "Temel İşlemci", + "item.refinedstorage.improved_processor": "İyileştirilmiş İşlemci", + "item.refinedstorage.advanced_processor": "Gelişmiş İşlemci", + "item.refinedstorage.1k_storage_part": "1K Depolama Parçası", + "item.refinedstorage.4k_storage_part": "4K Depolama Parçası", + "item.refinedstorage.16k_storage_part": "16K Depolama Parçası", + "item.refinedstorage.64k_storage_part": "64K Depolama Parçası", + "item.refinedstorage.1k_storage_disk": "1K Depolama Diski", + "item.refinedstorage.4k_storage_disk": "4K Depolama Diski", + "item.refinedstorage.16k_storage_disk": "16K Depolama Diski", + "item.refinedstorage.64k_storage_disk": "64K Depolama Diski", + "item.refinedstorage.storage_disk.help": "%s eşya depolar.", + "item.refinedstorage.storage_block.help": "%s eşya depolar.", + "item.refinedstorage.creative_storage_disk": "Yaratıcı Mod Depolama Diski", + "item.refinedstorage.creative_storage_disk.help": "Sonsuz miktarda eşya depolar.", + "item.refinedstorage.creative_storage_block.help": "Sonsuz miktarda eşya depolar.", + "item.refinedstorage.64b_fluid_storage_part": "64B Akışkan Depolama Parçası", + "item.refinedstorage.256b_fluid_storage_part": "256B Akışkan Depolama Parçası", + "item.refinedstorage.1024b_fluid_storage_part": "1024B Akışkan Depolama Parçası", + "item.refinedstorage.4096b_fluid_storage_part": "4096B Akışkan Depolama Parçası", + "item.refinedstorage.64b_fluid_storage_disk": "64B Akışkan Depolama Diski", + "item.refinedstorage.256b_fluid_storage_disk": "256B Akışkan Depolama Diski", + "item.refinedstorage.1024b_fluid_storage_disk": "1024B Akışkan Depolama Diski", + "item.refinedstorage.4096b_fluid_storage_disk": "4096B Akışkan Depolama Diski", + "item.refinedstorage.fluid_storage_disk.help": "%s kova depolar.", + "item.refinedstorage.fluid_storage_block.help": "%s kova depolar.", + "item.refinedstorage.creative_fluid_storage_disk": "Yaratıcı Mod Akışkan Depolama Diski", + "item.refinedstorage.creative_fluid_storage_disk.help": "Sonsuz miktarda kova depolar.", + "item.refinedstorage.creative_fluid_storage_block.help": "Sonsuz miktarda kova depolar.", + "item.refinedstorage.storage_housing": "Depolama Muhafazası", + "item.refinedstorage.construction_core": "Yapım Çekirdeği", + "item.refinedstorage.destruction_core": "Yıkım Çekirdeği", + "item.refinedstorage.wrench": "Anahtar", + "item.refinedstorage.wrench.help": "Blokları döndürmek için kullanın veya SHIFT'e basın ve Refined Storage bloklarını sökmek için kullanın.", + "item.refinedstorage.upgrade": "Yükseltme", + "item.refinedstorage.speed_upgrade": "Hız Yükseltmesi", + "item.refinedstorage.speed_upgrade.help": "Depolama ağı cihazının çalışma hızını artırır.", + "item.refinedstorage.stack_upgrade": "Yığın Yükseltmesi", + "item.refinedstorage.stack_upgrade.help": "Depolama ağı cihazının işlem başına işlediği kaynak miktarını artırır.", + "item.refinedstorage.silk_touch_upgrade": "İpeksi Dokunuş Yükseltmesi", + "item.refinedstorage.silk_touch_upgrade.help": "Kazmadaki İpeksi Dokunuş büyüsü gibi davranır.", + "item.refinedstorage.fortune_upgrade.1": "Servet I Yükseltmesi", + "item.refinedstorage.fortune_upgrade.2": "Servet II Yükseltmesi", + "item.refinedstorage.fortune_upgrade.3": "Servet III Yükseltmesi", + "item.refinedstorage.fortune_upgrade.help": "Bir bloğu kırarken daha fazla kaynak sağlar. Kazmadaki Servet büyüsü gibi davranır.", + "item.refinedstorage.regulator_upgrade": "Regülatör Yükseltmesi", + "item.refinedstorage.regulator_upgrade.help": "Dışarıya Aktarıcıda, yalnızca hedefteki miktar yükseltmede yapılandırılandan daha azsa dışarıya aktarır. İçe Aktarıcıda, yalnızca hedefteki miktar yükseltmede yapılandırılandan fazlaysa içe aktarır. Ayarlamak için eşyayı kullanın.", + "item.refinedstorage.range_upgrade": "Menzil Yükseltmesi", + "item.refinedstorage.range_upgrade.help": "Kablosuz Vericinin menzilini artırır.", + "item.refinedstorage.creative_range_upgrade": "Yaratıcı Mod Menzil Yükseltmesi", + "item.refinedstorage.creative_range_upgrade.help": "Kablosuz Verici için sonsuz menzil sağlar. Boyutlar arasında çalışmaz.", + "item.refinedstorage.wireless_grid": "Kablosuz Terminal", + "item.refinedstorage.creative_wireless_grid": "Yaratıcı Mod Kablosuz Terminal", + "item.refinedstorage.wireless_transmitter.help": "Kablosuz Terminal gibi eşyalar için kablosuz ağ erişimi sağlar. Daha geniş kapsama alanı için bir alanda birden fazlasına izin verilir.", + "item.refinedstorage.network_item.unbound": "Bağlanmamış.", + "item.refinedstorage.network_item.unbound.help": "Bağlamak için herhangi bir depolama ağı cihazında kullanın.", + "item.refinedstorage.network_item.bound_to": "%d, %d, %d konumuna bağlı.", + "item.refinedstorage.network_item.cannot_open_with_shortcut_due_to_duplicate": "Envanterinizde birden fazla %s var.", + "item.refinedstorage.network_item.cannot_open_because_not_found": "Envanterinizde hiç %s yok.", + "item.refinedstorage.configuration_card": "Yapılandırma Kartı", + "item.refinedstorage.configuration_card.empty": "Boş.", + "item.refinedstorage.configuration_card.configured": "%s için yapılandırma içeriyor.", + "item.refinedstorage.configuration_card.copied_configuration": "%s için yapılandırma kopyalandı.", + "item.refinedstorage.configuration_card.cleared_configuration": "Yapılandırma temizlendi.", + "item.refinedstorage.configuration_card.cannot_apply_configuration": "Yapılandırma kartı farklı türdeki cihazlara uygulanamıyor. %s için yapılandırılmış.", + "item.refinedstorage.configuration_card.applied_configuration": "Uygulanan yapılandırma.", + "item.refinedstorage.configuration_card.empty_help": "Yapılandırmasını ve yükseltmelerini karta kopyalamak için çömelip bir depolama ağı cihazında kullanın.", + "item.refinedstorage.configuration_card.configured_help": "Yapılandırmayı ve yükseltmeleri aktarmak için çömelirken hedef depolama ağı cihazında kullanın. Temizlemek için çömelirken kullanın.", + "item.refinedstorage.network_card": "Ağ Kartı", + "item.refinedstorage.network_card.unbound_help": "Ağ Alıcısına, çömelirken kullanın.", + "item.refinedstorage.network_card.unbound": "Bağlanmamış.", + "item.refinedstorage.network_card.bound_help": "Ağ Vericisine yerleştirin. Bağlamayı temizlemek için çömelirken kullanın.", + "item.refinedstorage.network_card.bound": "%s boyutunda %d, %d, %d konumuna bağlanıldı.", + "item.refinedstorage.network_transmitter.help": "Bir ağ sinyalini kablosuz olarak iletir. Ağ Alıcısı ile eşleştirilmiş Ağ Kartı gerekir.", + "item.refinedstorage.network_receiver.help": "Ağ sinyalini kablosuz olarak alır. Bu bloğa bir Ağ Kartı bağlayın.", + "item.refinedstorage.cable.help": "Depolama ağı cihazlarını birbirine bağlar.", + "item.refinedstorage.security_card": "Güvenlik Kartı", + "item.refinedstorage.security_card.cleared_configuration": "Yapılandırma temizlendi.", + "item.refinedstorage.security_card.unbound": "Bağlanmamış.", + "item.refinedstorage.security_card.unbound.help": "Mevcut oyuncuya yapılandırmak ve bağlamak için sağ tıklayın.", + "item.refinedstorage.security_card.bound": "%s adlı oyuncuya bağlı.", + "item.refinedstorage.security_card.bound.help": "Ayarlamak için sağ tıklayın. Yapılandırmayı ve bağlamayı temizlemek için çömelirken kullanın.", + "item.refinedstorage.fallback_security_card": "Yedek Güvenlik Kartı", + "item.refinedstorage.fallback_security_card.help": "Bir oyuncu için eşleşen bir Güvenlik Kartı bulunamazsa yedek olarak görev yapar. Yapılandırmak için sağ tıklayın. Yapılandırmayı temizlemek için çömelirken kullanın.", + "item.refinedstorage.portable_grid.help": "Bir depolama ağına bağlı değilken bir depolama diski ile etkileşime girmeye izin verir. Dünyada bir blok olarak veya envanterinizden kullanılabilir.", + "item.refinedstorage.storage_monitor.help": "Depolama ağınızdaki belirli bir kaynağın mevcut miktarını gösteren bir blok. Yapılandırmak için SHIFT + sağ tıklayın. Bir yığını çıkarmak için sol tıklayın, tek bir kaynağı çıkarmak için SHIFT + sol tıklayın, bir kaynağı eklemek için sağ tıklayın, kaynakları toplu olarak eklemek için birden çok kez sağ tıklayın.", + "misc.refinedstorage.stored": "Depolanmış: %s", + "misc.refinedstorage.stored_with_capacity": "Depolanmış: %s / %s (%d%%)", + "misc.refinedstorage.total": "Toplam %d", + "misc.refinedstorage.last_modified.just_now": "Son değişiklik %s tarafından yapıldı", + "misc.refinedstorage.last_modified.second": "Son değişiklik %d saniye önce %s tarafından yapıldı", + "misc.refinedstorage.last_modified.seconds": "Son değişiklik %d saniye önce %s tarafından yapıldı", + "misc.refinedstorage.last_modified.minute": "Son değişiklik %d dakika önce %s tarafından yapıldı", + "misc.refinedstorage.last_modified.minutes": "Son değişiklik %d dakika önce %s tarafından yapıldı", + "misc.refinedstorage.last_modified.hour": "Son değişiklik %d saat önce %s tarafından yapıldı", + "misc.refinedstorage.last_modified.hours": "Son değişiklik %d saat önce %s tarafından yapıldı", + "misc.refinedstorage.last_modified.day": "Son değişiklik %d gün önce %s tarafından yapıldı", + "misc.refinedstorage.last_modified.days": "Son değişiklik %d gün önce %s tarafından yapıldı", + "misc.refinedstorage.last_modified.week": "Son değişiklik %d hafta önce %s tarafından yapıldı", + "misc.refinedstorage.last_modified.weeks": "Son değişiklik %d hafta önce %s tarafından yapıldı", + "misc.refinedstorage.last_modified.year": "Son değişiklik %d yıl önce %s tarafından yapıldı", + "misc.refinedstorage.last_modified.years": "Son değişiklik %d yıl önce %s tarafından yapıldı", + "misc.refinedstorage.resource_type.item": "Eşya", + "misc.refinedstorage.resource_type.fluid": "Akışkan", + "misc.refinedstorage.press_shift_for_help": "Yardım için SHIFT'e basın", + "misc.refinedstorage.no_permission": "İzin yok", + "misc.refinedstorage.no_permission.open": "%s açmanıza izin verilmiyor.", + "misc.refinedstorage.no_permission.insert": "Eklemenize izin verilmiyor.", + "misc.refinedstorage.no_permission.extract": "Çıkarmanıza izin verilmiyor.", + "misc.refinedstorage.no_permission.build.place": "Buraya %s yerleştirmenize izin verilmiyor.", + "misc.refinedstorage.no_permission.build.break": "%s kırmanıza izin verilmiyor.", + "misc.refinedstorage.no_permission.build.rotate": "%s döndürmenize izin verilmiyor.", + "misc.refinedstorage.no_permission.build.dismantle": "%s sökmenize izin verilmiyor.", + "key.refinedstorage.focus_search_bar": "Arama çubuğuna odaklan", + "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Üretim Terminali matriksini, ağa temizle", + "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Üretim Terminali matriksini, envantere temizle", + "key.refinedstorage.open_wireless_grid": "Kablosuz Terminali Aç", + "key.refinedstorage.open_portable_grid": "Taşınabilir Terminali Aç", + "refinedstorage.subtitle.wrench": "Anahtar kullanıldı", + "permission.refinedstorage.insert": "Ekle", + "permission.refinedstorage.insert.description": "Oyuncunun bir ağa kaynak ekleyip ekleyemeyeceği.", + "permission.refinedstorage.extract": "Çıkart", + "permission.refinedstorage.extract.description": "Oyuncunun bir ağdan kaynak çıkarıp çıkaramayacağı.", + "permission.refinedstorage.autocrafting": "Otomatik Üretim", + "permission.refinedstorage.autocrafting.description": "Oyuncunun bir otomatik oluşturma görevini başlatıp başlatamayacağı, iptal edip edemeyeceği veya görüntüleyip görüntüleyemeyeceği.", + "permission.refinedstorage.open": "Aç", + "permission.refinedstorage.open.description": "Oyuncunun ağ cihazı GUI'lerini açıp açamayacağı.", + "permission.refinedstorage.build": "İnşa", + "permission.refinedstorage.build.description": "Oyuncunun ağ cihazları ekleyip ekleyemeyeceği.", + "permission.refinedstorage.security": "Güvenlik", + "permission.refinedstorage.security.description": "Oyuncunun bir ağ için güvenlik seçeneklerini yönetip yönetemeyeceği.", + "tag.item.refinedstorage.cables": "Kablolar", + "tag.item.refinedstorage.constructors": "Yapıcılar", + "tag.item.refinedstorage.controllers": "Denetleyiciler", + "tag.item.refinedstorage.crafting_grids": "Üretim Terminalleri", + "tag.item.refinedstorage.creative_controllers": "Yaratıcı Mod Denetleyicileri", + "tag.item.refinedstorage.destructors": "Yıkıcılar", + "tag.item.refinedstorage.detectors": "Dedektörler", + "tag.item.refinedstorage.exporters": "Dışarıya Aktarıcılar", + "tag.item.refinedstorage.external_storages": "Harici Depolar", + "tag.item.refinedstorage.fluid_storage_disks": "Akışkan Depolama Diskleri", + "tag.item.refinedstorage.grids": "Terminaller", + "tag.item.refinedstorage.importers": "İçe Aktarıcılar", + "tag.item.refinedstorage.network_receivers": "Ağ Alıcıları", + "tag.item.refinedstorage.network_transmitters": "Ağ Vericileri", + "tag.item.refinedstorage.relays": "Röleler", + "tag.item.refinedstorage.security_managers": "Güvenlik Yöneticileri", + "tag.item.refinedstorage.storage_disks": "Depolama Diskileri", + "tag.item.refinedstorage.wireless_transmitters": "Kablosuz Vericiler", + "tag.item.refinedstorage.disk_interfaces": "Disk Arayüzleri", + "text.autoconfig.refinedstorage.title": "Refined Storage Yapılandırması", + "refinedstorage.configuration.title": "Refined Storage Yapılandırması", + "refinedstorage.configuration.section.refinedstorage.common.toml": "Refined Storage Yapılandırması", + "refinedstorage.configuration.section.refinedstorage.common.toml.title": "Refined Storage Yapılandırması", + "text.autoconfig.refinedstorage.option.smoothScrolling": "Yumuşak kaydırma", + "text.autoconfig.refinedstorage.option.smoothScrolling.tooltip": "Kaydırma çubuklarının yumuşak kaydırmayı kullanıp kullanmayacağı.", + "text.autoconfig.refinedstorage.option.screenSize": "Ekran boyutu", + "text.autoconfig.refinedstorage.option.screenSize.tooltip": "Ekran boyutu.", + "text.autoconfig.refinedstorage.option.maxRowsStretch": "Ekran boyutu esnetildiğinde en fazla satır miktarı", + "text.autoconfig.refinedstorage.option.maxRowsStretch.tooltip": "Ekran boyutu esnetildiğinde görüntülenebilecek maksimum satır miktarı.", + "text.autoconfig.refinedstorage.option.grid": "Terminal", + "text.autoconfig.refinedstorage.option.grid.tooltip": "Terminal için yapılandırma.", + "text.autoconfig.refinedstorage.option.grid.largeFont": "Büyük yazı tipi", + "text.autoconfig.refinedstorage.option.grid.largeFont.tooltip": "Terminalin miktarlar için büyük bir yazı tipi kullanması gerekip gerekmediği.", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "SHIFT tuşu basılıyken sıralamayı önleme", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown.tooltip": "Shift basılı tutulduğunda Terminalin sıralamadan kaçınması gerekip gerekmediği.", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detaylı alet ipucusu", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip.tooltip": "Terminalin ayrıntılı bir alet ipucusu göstermesi gerekip gerekmediği.", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Arama sorgusunu hatırla", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery.tooltip": "Terminalin kapatılıp yeniden açıldığında arama sorgusunun korunup korunmayacağı.", + "text.autoconfig.refinedstorage.option.grid.energyUsage": "Enerji kullanımı", + "text.autoconfig.refinedstorage.option.grid.energyUsage.tooltip": "Terminal tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.grid.autoSelected": "Otomatik seçilen arama kutusu", + "text.autoconfig.refinedstorage.option.grid.autoSelected.tooltip": "Terminal açılırken arama kutusunun otomatik olarak seçilip seçilmeyeceği.", + "text.autoconfig.refinedstorage.option.grid.synchronizer": "Eşitleyici", + "text.autoconfig.refinedstorage.option.grid.synchronizer.tooltip": "Terminalin arama kutusunun senkronizasyon türü.", + "text.autoconfig.refinedstorage.option.grid.resourceType": "Kaynak türü", + "text.autoconfig.refinedstorage.option.grid.resourceType.tooltip": "Gösterilecek kaynak türü.", + "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sıralama yönü", + "text.autoconfig.refinedstorage.option.grid.sortingDirection.tooltip": "Sıralama yönü.", + "text.autoconfig.refinedstorage.option.grid.sortingType": "Sıralama türü", + "text.autoconfig.refinedstorage.option.grid.sortingType.tooltip": "Sıralama türü.", + "text.autoconfig.refinedstorage.option.craftingGrid": "Üretim Terminali", + "text.autoconfig.refinedstorage.option.craftingGrid.tooltip": "Üretim Terminali için yapılandırma.", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Enerji kullanımı", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage.tooltip": "Üretim Terminali tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Üretim matrisi, kapanma davranışı", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior.tooltip": "Üretim Terminalini kapatırken, üretim matrisi yuvalarına ne olduğu.", + "text.autoconfig.refinedstorage.option.controller": "Denetleyici", + "text.autoconfig.refinedstorage.option.controller.tooltip": "Denetleyici için yapılandırma.", + "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Enerji kapasitesi", + "text.autoconfig.refinedstorage.option.controller.energyCapacity.tooltip": "Denetleyicinin enerji kapasitesi.", + "text.autoconfig.refinedstorage.option.cable": "Kablo", + "text.autoconfig.refinedstorage.option.cable.tooltip": "Kablo için yapılandırma.", + "text.autoconfig.refinedstorage.option.cable.energyUsage": "Enerji kullanımı", + "text.autoconfig.refinedstorage.option.cable.energyUsage.tooltip": "Kablo tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.diskDrive": "Disk Sürücüsü", + "text.autoconfig.refinedstorage.option.diskDrive.tooltip": "Disk Sürücüsü için yapılandırma.", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Enerji kullanımı", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage.tooltip": "Disk Sürücüsü tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Disk başına enerji kullanımı", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk.tooltip": "Disk başına kullanılan enerji.", + "text.autoconfig.refinedstorage.option.diskInterface": "Disk Arayüzü", + "text.autoconfig.refinedstorage.option.diskInterface.tooltip": "Disk Arayüzü için yapılandırma.", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Enerji kullanımı", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage.tooltip": "Disk Arayüzü tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Disk başına enerji kullanımı", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk.tooltip": "Disk başına kullanılan enerji.", + "text.autoconfig.refinedstorage.option.storageBlock": "Depolama Bloğu", + "text.autoconfig.refinedstorage.option.storageBlock.tooltip": "Depolama Blokları için yapılandırma.", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K enerji kullanımı", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage.tooltip": "1K Depolama Bloğu tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K enerji kullanımı", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage.tooltip": "4K Depolama Bloğu tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K enerji kullanımı", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage.tooltip": "16K Depolama Bloğu tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K enerji kullanımı", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage.tooltip": "64K Depolama Bloğu tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Yaratıcı Mod enerji kullanımı", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage.tooltip": "Yaratıcı Mod Depolama Bloğu tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Akışkan Depolama Bloğu", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.tooltip": "Akışkan Depolama Blokları için Yapılandırma.", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B enerji kullanımı", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage.tooltip": "64B Akışkan Depolama Bloğu tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B enerji kullanımı", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage.tooltip": "256B Akışkan Depolama Bloğu tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B enerji kullanımı", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage.tooltip": "1024B Akışkan Depolama Bloğu tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B enerji kullanımı", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage.tooltip": "4096B Akışkan Depolama Bloğu tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Yaratıcı Mod enerji kullanımı", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage.tooltip": "Yaratıcı Mod Akışkan Depolama Bloğu tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.importer": "İçe Aktarıcı", + "text.autoconfig.refinedstorage.option.importer.tooltip": "İçe Aktarıcı için yapılandırma.", + "text.autoconfig.refinedstorage.option.importer.energyUsage": "Enerji kullanımı", + "text.autoconfig.refinedstorage.option.importer.energyUsage.tooltip": "İçe Aktarıcı tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.exporter": "Dışarıya Aktarıcı", + "text.autoconfig.refinedstorage.option.exporter.tooltip": "Dışarıya Aktarıcı için yapılandırma.", + "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Enerji kullanımı", + "text.autoconfig.refinedstorage.option.exporter.energyUsage.tooltip": "Dışarıya Aktarıcı tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.detector": "Dedektör", + "text.autoconfig.refinedstorage.option.detector.tooltip": "Dedektör için yapılandırma.", + "text.autoconfig.refinedstorage.option.detector.energyUsage": "Enerji kullanımı", + "text.autoconfig.refinedstorage.option.detector.energyUsage.tooltip": "Dedektör tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.constructor": "Yapıcı", + "text.autoconfig.refinedstorage.option.constructor.tooltip": "Yapıcı için yapılandırma.", + "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Enerji kullanımı", + "text.autoconfig.refinedstorage.option.constructor.energyUsage.tooltip": "Yapıcı tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.destructor": "Yıkıcı", + "text.autoconfig.refinedstorage.option.destructor.tooltip": "Yıkıcı için yapılandırma.", + "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Enerji kullanımı", + "text.autoconfig.refinedstorage.option.destructor.energyUsage.tooltip": "Yıkıcı tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.upgrade": "Yükseltme", + "text.autoconfig.refinedstorage.option.upgrade.tooltip": "Yükseltmeler için yapılandırma.", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Hız Yükseltmesi enerji kullanımı", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage.tooltip": "Hız Yükseltmesi başına kullanılan ek enerji.", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Yığın Yükseltmesi enerji kullanımı", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage.tooltip": "Yığın Yükseltmesi tarafından kullanılan ek enerji.", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Servet 1 Yükseltme enerji kullanımı", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage.tooltip": "Servet 1 Yükseltmesi tarafından kullanılan ek enerji.", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Servet 2 Yükseltme enerji kullanımı", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage.tooltip": "Servet 2 Yükseltmesi tarafından kullanılan ek enerji.", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Servet 3 Yükseltme enerji kullanımı", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage.tooltip": "Servet 3 Yükseltmesi tarafından kullanılan ek enerji.", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "İpeksi Dokunuş Yükseltmesi enerji kullanımı", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage.tooltip": "İpeksi Dokunuş Yükseltmesi tarafından kullanılan ek enerji.", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regülatör Yükseltmesi enerji kullanımı", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage.tooltip": "Regülatör Yükseltmesi tarafından kullanılan ek enerji.", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Menzil Yükseltmesi enerji kullanımı", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage.tooltip": "Menzil Yükseltmesi başına kullanılan ek enerji.", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Yaratıcı Mod Menzil Yükseltmesi enerji kullanımı", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage.tooltip": "Yaratıcı Mod Menzil Yükseltmesi tarafından kullanılan ek enerji.", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Menzil Yükseltmesi menzili", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange.tooltip": "Menzil Yükseltmesi tarafından sağlanan ek menzil.", + "text.autoconfig.refinedstorage.option.iface": "Arayüz", + "text.autoconfig.refinedstorage.option.iface.tooltip": "Arayüz için yapılandırma.", + "text.autoconfig.refinedstorage.option.iface.energyUsage": "Enerji kullanımı", + "text.autoconfig.refinedstorage.option.iface.energyUsage.tooltip": "Arayüz tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.externalStorage": "Harici Depo", + "text.autoconfig.refinedstorage.option.externalStorage.tooltip": "Harici Depo için yapılandırma.", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Enerji kullanımı", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage.tooltip": "Harici Depo tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.wirelessGrid": "Kablosuz Terminal", + "text.autoconfig.refinedstorage.option.wirelessGrid.tooltip": "Kablosuz Terminal için yapılandırma.", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Enerji kapasitesi", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity.tooltip": "Kablosuz Terminalin enerji kapasitesi.", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Aç enerji kullanımını", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage.tooltip": "Kablosuz Terminal tarafından açılmak için kullanılan enerji.", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Yerleştir enerji kullanımını", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage.tooltip": "Kablosuz Terminal tarafından kaynakları yerleştirmek için kullanılan enerji.", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Çıkart enerji kullanımını", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage.tooltip": "Kablosuz Terminal tarafından kaynakları çıkarmak için kullanılan enerji.", + "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Kablosuz Verici", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.tooltip": "Kablosuz Verici için yapılandırma.", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Enerji kullanımı", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage.tooltip": "Kablosuz Verici tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Temel menzil", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange.tooltip": "Kablosuz Vericinin temel menzili.", + "text.autoconfig.refinedstorage.option.storageMonitor": "Depolama Monitörü", + "text.autoconfig.refinedstorage.option.storageMonitor.tooltip": "Depolama Monitörü için yapılandırma.", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Enerji kullanımı", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage.tooltip": "Depolama Monitörü tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.networkReceiver": "Ağ Alıcısı", + "text.autoconfig.refinedstorage.option.networkReceiver.tooltip": "Ağ Alıcısı için yapılandırma.", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Enerji kullanımı", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage.tooltip": "Ağ Alıcısı tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.networkTransmitter": "Ağ Vericisi", + "text.autoconfig.refinedstorage.option.networkTransmitter.tooltip": "Ağ Vericisi için yapılandırma.", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Enerji kullanımı", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage.tooltip": "Ağ Vericisi tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.portableGrid": "Taşınabilir Terminal", + "text.autoconfig.refinedstorage.option.portableGrid.tooltip": "Taşınabilir Terminal için yapılandırma.", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Enerji kapasitesi", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity.tooltip": "Taşınabilir Terminalin enerji kapasitesi.", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Aç enerji kullanımı", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage.tooltip": "Taşınabilir Terminal tarafından açılmak için kullanılan enerji.", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Yerleştir enerji kullanımı", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage.tooltip": "Taşınabilir Terminal tarafından kaynakları yerleştirmek için kullanılan enerji.", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Çıkart enerji kullanımı", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage.tooltip": "Taşınabilir Terminal tarafından kaynakları çıkarmak için kullanılan enerji.", + "text.autoconfig.refinedstorage.option.securityCard": "Güvenlik Kartı", + "text.autoconfig.refinedstorage.option.securityCard.tooltip": "Güvenlik Kartı için yapılandırma.", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Enerji kullanımı", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage.tooltip": "Güvenlik Kartı tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Yedek Güvenlik Kartı", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.tooltip": "Yedek Güvenlik Kartı için yapılandırma.", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Enerji kullanımı", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage.tooltip": "Yedek Güvenlik Kartı tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.securityManager": "Güvenlik Yöneticisi", + "text.autoconfig.refinedstorage.option.securityManager.tooltip": "Güvenlik Yöneticisi için yapılandırma.", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Enerji kullanımı", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage.tooltip": "Güvenlik Yöneticisi tarafından kullanılan enerji.", + "text.autoconfig.refinedstorage.option.relay": "Röle", + "text.autoconfig.refinedstorage.option.relay.tooltip": "Röle için yapılandırma.", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Giriş ağı enerji kullanımı", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage.tooltip": "Giriş ağı enerji kullanımı.", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Çıkış ağı enerji kullanımı (doğrudan geçiş modunda değilse)", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage.tooltip": "Çıkış ağı enerji kullanımı (doğrudan geçiş modunda değilse).", + "advancements.refinedstorage.root.description": "Ağınıza enerji sağlamak için bir depolama ağında bir veya birden fazla Denetleyici kullanın", + "advancements.refinedstorage.connecting": "Bağlanıyor", + "advancements.refinedstorage.connecting.description": "Cihazları birbirlerine bağlamak veya cihazları birbirlerine doğru yerleştirmek için Kablo kullanın", + "advancements.refinedstorage.drives": "Sürücüler", + "advancements.refinedstorage.drives.description": "Depolama disklerinizi saklayabilmek için bir Disk Sürücüsü oluşturun", + "advancements.refinedstorage.interfacing_with_disks": "Disklerle arayüz oluşturma", + "advancements.refinedstorage.interfacing_with_disks.description": "Kaynakları depolama ağı ve depolama diskleri arasında aktarmak için bir Disk Arayüzü oluşturun", + "advancements.refinedstorage.storing_items": "Eşyaların saklanması", + "advancements.refinedstorage.storing_items.description": "Bir Depolama Diski oluşturun ve Disk Sürücünüze yerleştirin", + "advancements.refinedstorage.viewing_your_storage": "Deponuzu görüntüleme", + "advancements.refinedstorage.viewing_your_storage.description": "Deponuzla etkileşim kurmak için bir Terminal oluşturun", + "advancements.refinedstorage.upgrading_your_grid": "Terminalinizin Yükseltilmesi", + "advancements.refinedstorage.upgrading_your_grid.description": "Üretim yetenekleri elde etmek için Terminalinizi, Üretim Terminaline yükseltin", + "advancements.refinedstorage.storing_fluids": "Akışkanların depolanması", + "advancements.refinedstorage.storing_fluids.description": "Bir Akışkan Depolama Diski oluşturun ve Disk Sürücünüze yerleştirin", + "advancements.refinedstorage.importing": "İçe Aktarım", + "advancements.refinedstorage.importing.description": "İçe Aktarıcı ile kaynakları depolama ağına alın", + "advancements.refinedstorage.exporting": "Dışa Aktarım", + "advancements.refinedstorage.exporting.description": "Dışa Aktarıcı ile depolama ağından kaynakları çıkarın", + "advancements.refinedstorage.upgrading": "Yükseltme", + "advancements.refinedstorage.upgrading.description": "Çeşitli cihazları iyileştirmek için bir Yükseltme oluşturun", + "advancements.refinedstorage.interface_to_the_world": "Dünyayla Arayüz", + "advancements.refinedstorage.interface_to_the_world.description": "Arayüz ile öğeleri aynı anda dışa ve içe aktarın", + "advancements.refinedstorage.storing_externally": "Harici olarak depolama", + "advancements.refinedstorage.storing_externally.description": "Ağa sandık gibi harici bir bloktan depolama alanı sağlamak için Harici Depo kullanın", + "advancements.refinedstorage.detecting": "Tespit", + "advancements.refinedstorage.detecting.description": "Depolama ağında depolanan kaynakları kontrol etmek için redstone kullanın", + "advancements.refinedstorage.construction": "Yapım", + "advancements.refinedstorage.construction.description": "Yapıcı ile blokları depolama ağından dünyaya taşıyın", + "advancements.refinedstorage.destruction": "Yıkım", + "advancements.refinedstorage.destruction.description": "Yıkıcı ile dünyadaki blokları depolama ağına aktarın", + "advancements.refinedstorage.wireless": "Kablosuz", + "advancements.refinedstorage.wireless.description": "Kablosuz Terminal ile kaynaklarınıza kablosuz olarak erişin", + "advancements.refinedstorage.better_than_a_barrel": "Varilden daha iyi", + "advancements.refinedstorage.better_than_a_barrel.description": "Bir depolama ağındaki kaynakları görüntülemek, eklemek veya çıkarmak için bir Depolama Monitörü oluşturun", + "advancements.refinedstorage.no_cables_required": "Kablo gerekli değil", + "advancements.refinedstorage.no_cables_required.description": "Ağ Vericisi, Ağ Alıcısı ve Ağ Kartı kullanarak kablo kullanmadan depolama ağınıza ekstra bileşenler ekleyin", + "advancements.refinedstorage.portable_storage": "Taşınabilir depo", + "advancements.refinedstorage.portable_storage.description": "Depolama ağı gerektirmeden disklerin içeriğine erişmek için bir Taşınabilir Terminal oluşturun", + "advancements.refinedstorage.security": "Güvenlik", + "advancements.refinedstorage.security.description": "Depolama ağınızı bir Güvenlik Yöneticisi ve Güvenlik Kartı ile güvence altına alın", + "advancements.refinedstorage.conditional_connecting": "Koşullu bağlantı", + "advancements.refinedstorage.conditional_connecting.description": "Bir depolama ağının tüm bölümlerini açın veya kapatın ve bir Röle ile ağınızın yeni dallarını oluşturun" +} From 328e1bfeb40342a81c375da4a5f75c9a36fe8ef8 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 21 Jul 2024 10:04:49 +0200 Subject: [PATCH 26/36] refactor: remove platform prefix from modules, rename platform-api to common-api --- .github/CONTRIBUTING.md | 43 +- .github/ISSUE_TEMPLATE/config.yml | 6 +- .github/ISSUE_TEMPLATE/enhancement.yml | 38 +- CHANGELOG.md | 643 +++++++++--------- README.md | 2 +- build.gradle.kts | 5 +- config/intellij-code-style.xml | 128 ++-- crowdin.yml | 4 +- .../decision/001-multi-loader-architecture.md | 2 +- .../decision/003-the-platform-api-module.md | 8 +- .../decision/004-coverage-requirements.md | 6 +- .../decision/007-refined-architect.md | 10 +- doc/architecture/decision/008-versioning.md | 3 +- .../decision/009-package-by-feature.md | 6 +- .../decision/010-shared-storage.md | 3 +- .../build.gradle.kts | 2 +- .../common}/api/PlatformApi.java | 76 +-- .../common}/api/PlatformApiProxy.java | 76 +-- .../common}/api/RefinedStoragePlugin.java | 2 +- .../ConfigurationCardTarget.java | 2 +- .../api/configurationcard/package-info.java | 7 + .../ConstructorStrategy.java | 2 +- .../ConstructorStrategyFactory.java | 4 +- .../DestructorStrategy.java | 2 +- .../DestructorStrategyFactory.java | 4 +- .../constructordestructor/package-info.java | 7 + .../common}/api/exporter/AmountOverride.java | 2 +- .../ExporterTransferStrategyFactory.java | 4 +- .../common/api/exporter/package-info.java | 7 + .../refinedstorage/common}/api/grid/Grid.java | 4 +- .../common}/api/grid/GridInsertionHint.java | 2 +- .../common}/api/grid/GridInsertionHints.java | 2 +- .../api/grid/GridResourceAttributeKeys.java | 2 +- .../common}/api/grid/GridScrollMode.java | 2 +- .../common}/api/grid/GridSynchronizer.java | 2 +- .../common/api/grid}/package-info.java | 2 +- .../grid/strategy/GridExtractionStrategy.java | 4 +- .../GridExtractionStrategyFactory.java | 4 +- .../grid/strategy/GridInsertionStrategy.java | 2 +- .../GridInsertionStrategyFactory.java | 4 +- .../grid/strategy/GridScrollingStrategy.java | 6 +- .../GridScrollingStrategyFactory.java | 4 +- .../api/grid/strategy}/package-info.java | 2 +- .../view/AbstractPlatformGridResource.java | 2 +- .../api/grid/view/PlatformGridResource.java | 10 +- .../common/api/grid/view}/package-info.java | 2 +- .../ImporterTransferStrategyFactory.java | 6 +- .../common/api/importer/package-info.java | 7 + .../common}/api/package-info.java | 2 +- .../api/security/BuiltinPermissions.java | 2 +- .../api/security/PlatformPermission.java | 2 +- .../PlatformSecurityNetworkComponent.java | 2 +- .../common}/api/security/SecurityHelper.java | 4 +- .../security/SecurityPolicyContainerItem.java | 2 +- .../common/api/security/package-info.java | 7 + .../AbstractStorageContainerBlockItem.java | 4 +- .../storage/AbstractStorageContainerItem.java | 4 +- .../common}/api/storage/PlayerActor.java | 2 +- .../api/storage/SerializableStorage.java | 4 +- .../api/storage/StorageBlockEntity.java | 2 +- .../api/storage/StorageContainerItem.java | 2 +- .../storage/StorageContainerItemHelper.java | 2 +- .../common}/api/storage/StorageInfo.java | 2 +- .../api/storage/StorageRepository.java | 2 +- .../common}/api/storage/StorageType.java | 2 +- .../storage/channel/FuzzyStorageChannel.java | 2 +- .../api/storage/channel/package-info.java | 7 + ...latformExternalStorageProviderFactory.java | 2 +- .../externalstorage}/package-info.java | 2 +- .../common/api/storage/package-info.java | 7 + .../StorageMonitorExtractionStrategy.java | 2 +- .../StorageMonitorInsertionStrategy.java | 2 +- .../api/storagemonitor}/package-info.java | 2 +- .../common}/api/support/AmountFormatting.java | 2 +- .../api/support/HelpTooltipComponent.java | 2 +- .../energy/AbstractEnergyBlockItem.java | 2 +- .../support/energy/AbstractEnergyItem.java | 2 +- .../AbstractNetworkBoundEnergyItem.java | 12 +- .../api/support/energy/EnergyItemHelper.java | 2 +- .../energy/TransferableBlockEntityEnergy.java | 2 +- .../api/support/energy}/package-info.java | 2 +- ...stractNetworkNodeContainerBlockEntity.java | 4 +- .../api/support/network/ConnectionLogic.java | 8 +- .../api/support/network/ConnectionSink.java | 2 +- .../network/InWorldNetworkNodeContainer.java | 2 +- .../NetworkNodeContainerBlockEntity.java | 6 +- .../bounditem/NetworkBoundItemHelper.java | 4 +- .../bounditem/NetworkBoundItemSession.java | 2 +- .../NetworkBoundItemTargetBlockEntity.java | 2 +- .../network/bounditem/package-info.java | 7 + .../api/support/network/package-info.java | 7 + .../common/api/support/package-info.java | 7 + .../support/registry/PlatformRegistry.java | 2 +- .../api/support/registry/package-info.java | 7 + .../resource/AbstractResourceType.java | 2 +- .../resource/FluidOperationResult.java | 2 +- .../support/resource/FuzzyModeNormalizer.java | 2 +- .../support/resource/PlatformResourceKey.java | 2 +- .../RecipeModIngredientConverter.java | 2 +- .../support/resource/ResourceContainer.java | 2 +- .../ResourceContainerInsertStrategy.java | 2 +- .../api/support/resource/ResourceFactory.java | 2 +- .../support/resource/ResourceRendering.java | 2 +- .../api/support/resource/ResourceType.java | 2 +- .../resource/list/FuzzyResourceList.java | 4 +- .../support/resource/list/package-info.java | 7 + .../api/support/resource/package-info.java | 7 + .../support/slotreference/SlotReference.java | 2 +- .../slotreference/SlotReferenceFactory.java | 4 +- .../SlotReferenceHandlerItem.java | 2 +- .../slotreference/SlotReferenceProvider.java | 2 +- .../support/slotreference/package-info.java | 7 + .../api/upgrade/AbstractUpgradeItem.java | 2 +- .../api/upgrade/UpgradeDestination.java | 2 +- .../common}/api/upgrade/UpgradeItem.java | 2 +- .../common}/api/upgrade/UpgradeMapping.java | 2 +- .../common}/api/upgrade/UpgradeRegistry.java | 2 +- .../common}/api/upgrade/UpgradeState.java | 2 +- .../common/api/upgrade/package-info.java | 7 + .../WirelessTransmitter.java | 2 +- .../WirelessTransmitterRangeModifier.java | 4 +- .../wirelesstransmitter}/package-info.java | 2 +- .../api/support/AmountFormattingTest.java | 2 +- .../build.gradle.kts | 4 +- .../blockstates/black_cable.json | 0 .../blockstates/black_constructor.json | 0 .../blockstates/black_controller.json | 0 .../blockstates/black_crafting_grid.json | 0 .../black_creative_controller.json | 0 .../blockstates/black_destructor.json | 0 .../blockstates/black_detector.json | 0 .../blockstates/black_disk_interface.json | 0 .../blockstates/black_exporter.json | 0 .../blockstates/black_external_storage.json | 0 .../blockstates/black_grid.json | 0 .../blockstates/black_importer.json | 0 .../blockstates/black_network_receiver.json | 0 .../black_network_transmitter.json | 0 .../blockstates/black_relay.json | 0 .../blockstates/black_security_manager.json | 0 .../black_wireless_transmitter.json | 0 .../blockstates/blue_cable.json | 0 .../blockstates/blue_constructor.json | 0 .../blockstates/blue_controller.json | 0 .../blockstates/blue_crafting_grid.json | 0 .../blockstates/blue_creative_controller.json | 0 .../blockstates/blue_destructor.json | 0 .../blockstates/blue_detector.json | 0 .../blockstates/blue_disk_interface.json | 0 .../blockstates/blue_exporter.json | 0 .../blockstates/blue_external_storage.json | 0 .../refinedstorage/blockstates/blue_grid.json | 0 .../blockstates/blue_importer.json | 0 .../blockstates/blue_network_receiver.json | 0 .../blockstates/blue_network_transmitter.json | 0 .../blockstates/blue_relay.json | 0 .../blockstates/blue_security_manager.json | 0 .../blue_wireless_transmitter.json | 0 .../blockstates/brown_cable.json | 0 .../blockstates/brown_constructor.json | 0 .../blockstates/brown_controller.json | 0 .../blockstates/brown_crafting_grid.json | 0 .../brown_creative_controller.json | 0 .../blockstates/brown_destructor.json | 0 .../blockstates/brown_detector.json | 0 .../blockstates/brown_disk_interface.json | 0 .../blockstates/brown_exporter.json | 0 .../blockstates/brown_external_storage.json | 0 .../blockstates/brown_grid.json | 0 .../blockstates/brown_importer.json | 0 .../blockstates/brown_network_receiver.json | 0 .../brown_network_transmitter.json | 0 .../blockstates/brown_relay.json | 0 .../blockstates/brown_security_manager.json | 0 .../brown_wireless_transmitter.json | 0 .../refinedstorage/blockstates/cable.json | 0 .../blockstates/constructor.json | 0 .../blockstates/controller.json | 0 .../blockstates/crafting_grid.json | 0 .../blockstates/creative_controller.json | 0 .../blockstates/cyan_cable.json | 0 .../blockstates/cyan_constructor.json | 0 .../blockstates/cyan_controller.json | 0 .../blockstates/cyan_crafting_grid.json | 0 .../blockstates/cyan_creative_controller.json | 0 .../blockstates/cyan_destructor.json | 0 .../blockstates/cyan_detector.json | 0 .../blockstates/cyan_disk_interface.json | 0 .../blockstates/cyan_exporter.json | 0 .../blockstates/cyan_external_storage.json | 0 .../refinedstorage/blockstates/cyan_grid.json | 0 .../blockstates/cyan_importer.json | 0 .../blockstates/cyan_network_receiver.json | 0 .../blockstates/cyan_network_transmitter.json | 0 .../blockstates/cyan_relay.json | 0 .../blockstates/cyan_security_manager.json | 0 .../cyan_wireless_transmitter.json | 0 .../blockstates/destructor.json | 0 .../refinedstorage/blockstates/detector.json | 0 .../blockstates/disk_interface.json | 0 .../refinedstorage/blockstates/exporter.json | 0 .../blockstates/external_storage.json | 0 .../blockstates/gray_controller.json | 0 .../blockstates/gray_crafting_grid.json | 0 .../blockstates/gray_creative_controller.json | 0 .../blockstates/gray_detector.json | 0 .../blockstates/gray_disk_interface.json | 0 .../refinedstorage/blockstates/gray_grid.json | 0 .../blockstates/gray_network_receiver.json | 0 .../blockstates/gray_network_transmitter.json | 0 .../blockstates/gray_relay.json | 0 .../blockstates/gray_security_manager.json | 0 .../gray_wireless_transmitter.json | 0 .../blockstates/green_cable.json | 0 .../blockstates/green_constructor.json | 0 .../blockstates/green_controller.json | 0 .../blockstates/green_crafting_grid.json | 0 .../green_creative_controller.json | 0 .../blockstates/green_destructor.json | 0 .../blockstates/green_detector.json | 0 .../blockstates/green_disk_interface.json | 0 .../blockstates/green_exporter.json | 0 .../blockstates/green_external_storage.json | 0 .../blockstates/green_grid.json | 0 .../blockstates/green_importer.json | 0 .../blockstates/green_network_receiver.json | 0 .../green_network_transmitter.json | 0 .../blockstates/green_relay.json | 0 .../blockstates/green_security_manager.json | 0 .../green_wireless_transmitter.json | 0 .../refinedstorage/blockstates/grid.json | 0 .../refinedstorage/blockstates/importer.json | 0 .../blockstates/light_blue_cable.json | 0 .../blockstates/light_blue_constructor.json | 0 .../blockstates/light_blue_destructor.json | 0 .../blockstates/light_blue_exporter.json | 0 .../light_blue_external_storage.json | 0 .../blockstates/light_blue_importer.json | 0 .../blockstates/light_gray_cable.json | 0 .../blockstates/light_gray_constructor.json | 0 .../blockstates/light_gray_controller.json | 0 .../blockstates/light_gray_crafting_grid.json | 0 .../light_gray_creative_controller.json | 0 .../blockstates/light_gray_destructor.json | 0 .../blockstates/light_gray_detector.json | 0 .../light_gray_disk_interface.json | 0 .../blockstates/light_gray_exporter.json | 0 .../light_gray_external_storage.json | 0 .../blockstates/light_gray_grid.json | 0 .../blockstates/light_gray_importer.json | 0 .../light_gray_network_receiver.json | 0 .../light_gray_network_transmitter.json | 0 .../blockstates/light_gray_relay.json | 0 .../light_gray_security_manager.json | 0 .../light_gray_wireless_transmitter.json | 0 .../blockstates/lime_cable.json | 0 .../blockstates/lime_constructor.json | 0 .../blockstates/lime_controller.json | 0 .../blockstates/lime_crafting_grid.json | 0 .../blockstates/lime_creative_controller.json | 0 .../blockstates/lime_destructor.json | 0 .../blockstates/lime_detector.json | 0 .../blockstates/lime_disk_interface.json | 0 .../blockstates/lime_exporter.json | 0 .../blockstates/lime_external_storage.json | 0 .../refinedstorage/blockstates/lime_grid.json | 0 .../blockstates/lime_importer.json | 0 .../blockstates/lime_network_receiver.json | 0 .../blockstates/lime_network_transmitter.json | 0 .../blockstates/lime_relay.json | 0 .../blockstates/lime_security_manager.json | 0 .../lime_wireless_transmitter.json | 0 .../blockstates/magenta_cable.json | 0 .../blockstates/magenta_constructor.json | 0 .../blockstates/magenta_controller.json | 0 .../blockstates/magenta_crafting_grid.json | 0 .../magenta_creative_controller.json | 0 .../blockstates/magenta_destructor.json | 0 .../blockstates/magenta_detector.json | 0 .../blockstates/magenta_disk_interface.json | 0 .../blockstates/magenta_exporter.json | 0 .../blockstates/magenta_external_storage.json | 0 .../blockstates/magenta_grid.json | 0 .../blockstates/magenta_importer.json | 0 .../blockstates/magenta_network_receiver.json | 0 .../magenta_network_transmitter.json | 0 .../blockstates/magenta_relay.json | 0 .../blockstates/magenta_security_manager.json | 0 .../magenta_wireless_transmitter.json | 0 .../blockstates/network_receiver.json | 0 .../blockstates/network_transmitter.json | 0 .../blockstates/orange_cable.json | 0 .../blockstates/orange_constructor.json | 0 .../blockstates/orange_controller.json | 0 .../blockstates/orange_crafting_grid.json | 0 .../orange_creative_controller.json | 0 .../blockstates/orange_destructor.json | 0 .../blockstates/orange_detector.json | 0 .../blockstates/orange_disk_interface.json | 0 .../blockstates/orange_exporter.json | 0 .../blockstates/orange_external_storage.json | 0 .../blockstates/orange_grid.json | 0 .../blockstates/orange_importer.json | 0 .../blockstates/orange_network_receiver.json | 0 .../orange_network_transmitter.json | 0 .../blockstates/orange_relay.json | 0 .../blockstates/orange_security_manager.json | 0 .../orange_wireless_transmitter.json | 0 .../blockstates/pink_cable.json | 0 .../blockstates/pink_constructor.json | 0 .../blockstates/pink_controller.json | 0 .../blockstates/pink_crafting_grid.json | 0 .../blockstates/pink_creative_controller.json | 0 .../blockstates/pink_destructor.json | 0 .../blockstates/pink_detector.json | 0 .../blockstates/pink_disk_interface.json | 0 .../blockstates/pink_exporter.json | 0 .../blockstates/pink_external_storage.json | 0 .../refinedstorage/blockstates/pink_grid.json | 0 .../blockstates/pink_importer.json | 0 .../blockstates/pink_network_receiver.json | 0 .../blockstates/pink_network_transmitter.json | 0 .../blockstates/pink_relay.json | 0 .../blockstates/pink_security_manager.json | 0 .../pink_wireless_transmitter.json | 0 .../blockstates/purple_cable.json | 0 .../blockstates/purple_constructor.json | 0 .../blockstates/purple_controller.json | 0 .../blockstates/purple_crafting_grid.json | 0 .../purple_creative_controller.json | 0 .../blockstates/purple_destructor.json | 0 .../blockstates/purple_detector.json | 0 .../blockstates/purple_disk_interface.json | 0 .../blockstates/purple_exporter.json | 0 .../blockstates/purple_external_storage.json | 0 .../blockstates/purple_grid.json | 0 .../blockstates/purple_importer.json | 0 .../blockstates/purple_network_receiver.json | 0 .../purple_network_transmitter.json | 0 .../blockstates/purple_relay.json | 0 .../blockstates/purple_security_manager.json | 0 .../purple_wireless_transmitter.json | 0 .../refinedstorage/blockstates/red_cable.json | 0 .../blockstates/red_constructor.json | 0 .../blockstates/red_controller.json | 0 .../blockstates/red_crafting_grid.json | 0 .../blockstates/red_creative_controller.json | 0 .../blockstates/red_destructor.json | 0 .../blockstates/red_detector.json | 0 .../blockstates/red_disk_interface.json | 0 .../blockstates/red_exporter.json | 0 .../blockstates/red_external_storage.json | 0 .../refinedstorage/blockstates/red_grid.json | 0 .../blockstates/red_importer.json | 0 .../blockstates/red_network_receiver.json | 0 .../blockstates/red_network_transmitter.json | 0 .../refinedstorage/blockstates/red_relay.json | 0 .../blockstates/red_security_manager.json | 0 .../blockstates/red_wireless_transmitter.json | 0 .../refinedstorage/blockstates/relay.json | 0 .../blockstates/security_manager.json | 0 .../blockstates/white_cable.json | 0 .../blockstates/white_constructor.json | 0 .../blockstates/white_controller.json | 0 .../blockstates/white_crafting_grid.json | 0 .../white_creative_controller.json | 0 .../blockstates/white_destructor.json | 0 .../blockstates/white_detector.json | 0 .../blockstates/white_disk_interface.json | 0 .../blockstates/white_exporter.json | 0 .../blockstates/white_external_storage.json | 0 .../blockstates/white_grid.json | 0 .../blockstates/white_importer.json | 0 .../blockstates/white_network_receiver.json | 0 .../white_network_transmitter.json | 0 .../blockstates/white_relay.json | 0 .../blockstates/white_security_manager.json | 0 .../white_wireless_transmitter.json | 0 .../blockstates/wireless_transmitter.json | 0 .../blockstates/yellow_cable.json | 0 .../blockstates/yellow_constructor.json | 0 .../blockstates/yellow_controller.json | 0 .../blockstates/yellow_crafting_grid.json | 0 .../yellow_creative_controller.json | 0 .../blockstates/yellow_destructor.json | 0 .../blockstates/yellow_detector.json | 0 .../blockstates/yellow_disk_interface.json | 0 .../blockstates/yellow_exporter.json | 0 .../blockstates/yellow_external_storage.json | 0 .../blockstates/yellow_grid.json | 0 .../blockstates/yellow_importer.json | 0 .../blockstates/yellow_network_receiver.json | 0 .../yellow_network_transmitter.json | 0 .../blockstates/yellow_relay.json | 0 .../blockstates/yellow_security_manager.json | 0 .../yellow_wireless_transmitter.json | 0 .../models/block/cable/core/black.json | 0 .../models/block/cable/core/blue.json | 0 .../models/block/cable/core/brown.json | 0 .../models/block/cable/core/cyan.json | 0 .../models/block/cable/core/gray.json | 0 .../models/block/cable/core/green.json | 0 .../models/block/cable/core/light_blue.json | 0 .../models/block/cable/core/light_gray.json | 0 .../models/block/cable/core/lime.json | 0 .../models/block/cable/core/magenta.json | 0 .../models/block/cable/core/orange.json | 0 .../models/block/cable/core/pink.json | 0 .../models/block/cable/core/purple.json | 0 .../models/block/cable/core/red.json | 0 .../models/block/cable/core/white.json | 0 .../models/block/cable/core/yellow.json | 0 .../models/block/cable/extension/black.json | 0 .../models/block/cable/extension/blue.json | 0 .../models/block/cable/extension/brown.json | 0 .../models/block/cable/extension/cyan.json | 0 .../models/block/cable/extension/gray.json | 0 .../models/block/cable/extension/green.json | 0 .../block/cable/extension/light_blue.json | 0 .../block/cable/extension/light_gray.json | 0 .../models/block/cable/extension/lime.json | 0 .../models/block/cable/extension/magenta.json | 0 .../models/block/cable/extension/orange.json | 0 .../models/block/cable/extension/pink.json | 0 .../models/block/cable/extension/purple.json | 0 .../models/block/cable/extension/red.json | 0 .../models/block/cable/extension/white.json | 0 .../models/block/cable/extension/yellow.json | 0 .../models/block/controller/black.json | 0 .../models/block/controller/blue.json | 0 .../models/block/controller/brown.json | 0 .../models/block/controller/cyan.json | 0 .../models/block/controller/gray.json | 0 .../models/block/controller/green.json | 0 .../models/block/controller/light_blue.json | 0 .../models/block/controller/light_gray.json | 0 .../models/block/controller/lime.json | 0 .../models/block/controller/magenta.json | 0 .../models/block/controller/orange.json | 0 .../models/block/controller/pink.json | 0 .../models/block/controller/purple.json | 0 .../models/block/controller/red.json | 0 .../models/block/controller/white.json | 0 .../models/block/controller/yellow.json | 0 .../models/block/crafting_grid/black.json | 0 .../models/block/crafting_grid/blue.json | 0 .../models/block/crafting_grid/brown.json | 0 .../models/block/crafting_grid/cyan.json | 0 .../models/block/crafting_grid/gray.json | 0 .../models/block/crafting_grid/green.json | 0 .../models/block/crafting_grid/inactive.json | 0 .../block/crafting_grid/light_blue.json | 0 .../block/crafting_grid/light_gray.json | 0 .../models/block/crafting_grid/lime.json | 0 .../models/block/crafting_grid/magenta.json | 0 .../models/block/crafting_grid/orange.json | 0 .../models/block/crafting_grid/pink.json | 0 .../models/block/crafting_grid/purple.json | 0 .../models/block/crafting_grid/red.json | 0 .../models/block/crafting_grid/white.json | 0 .../models/block/crafting_grid/yellow.json | 0 .../models/block/detector/black.json | 0 .../models/block/detector/blue.json | 0 .../models/block/detector/brown.json | 0 .../models/block/detector/cyan.json | 0 .../models/block/detector/gray.json | 0 .../models/block/detector/green.json | 0 .../models/block/detector/light_blue.json | 0 .../models/block/detector/light_gray.json | 0 .../models/block/detector/lime.json | 0 .../models/block/detector/magenta.json | 0 .../models/block/detector/orange.json | 0 .../models/block/detector/pink.json | 0 .../models/block/detector/purple.json | 0 .../models/block/detector/red.json | 0 .../models/block/detector/white.json | 0 .../models/block/detector/yellow.json | 0 .../block/disk_interface/base_black.json | 0 .../block/disk_interface/base_blue.json | 0 .../block/disk_interface/base_brown.json | 0 .../block/disk_interface/base_cyan.json | 0 .../block/disk_interface/base_gray.json | 0 .../block/disk_interface/base_green.json | 0 .../block/disk_interface/base_light_blue.json | 0 .../block/disk_interface/base_light_gray.json | 0 .../block/disk_interface/base_lime.json | 0 .../block/disk_interface/base_magenta.json | 0 .../block/disk_interface/base_orange.json | 0 .../block/disk_interface/base_pink.json | 0 .../block/disk_interface/base_purple.json | 0 .../models/block/disk_interface/base_red.json | 0 .../block/disk_interface/base_white.json | 0 .../block/disk_interface/base_yellow.json | 0 .../models/block/disk_interface/black.json | 0 .../models/block/disk_interface/blue.json | 0 .../models/block/disk_interface/brown.json | 0 .../models/block/disk_interface/cyan.json | 0 .../models/block/disk_interface/gray.json | 0 .../models/block/disk_interface/green.json | 0 .../models/block/disk_interface/inactive.json | 0 .../block/disk_interface/light_blue.json | 0 .../block/disk_interface/light_gray.json | 0 .../models/block/disk_interface/lime.json | 0 .../models/block/disk_interface/magenta.json | 0 .../models/block/disk_interface/orange.json | 0 .../models/block/disk_interface/pink.json | 0 .../models/block/disk_interface/purple.json | 0 .../models/block/disk_interface/red.json | 0 .../models/block/disk_interface/white.json | 0 .../models/block/disk_interface/yellow.json | 0 .../models/block/grid/black.json | 0 .../models/block/grid/blue.json | 0 .../models/block/grid/brown.json | 0 .../models/block/grid/cyan.json | 0 .../models/block/grid/gray.json | 0 .../models/block/grid/green.json | 0 .../models/block/grid/inactive.json | 0 .../models/block/grid/light_blue.json | 0 .../models/block/grid/light_gray.json | 0 .../models/block/grid/lime.json | 0 .../models/block/grid/magenta.json | 0 .../models/block/grid/orange.json | 0 .../models/block/grid/pink.json | 0 .../models/block/grid/purple.json | 0 .../refinedstorage/models/block/grid/red.json | 0 .../models/block/grid/white.json | 0 .../models/block/grid/yellow.json | 0 .../models/block/network_receiver/black.json | 0 .../models/block/network_receiver/blue.json | 0 .../models/block/network_receiver/brown.json | 0 .../models/block/network_receiver/cyan.json | 0 .../models/block/network_receiver/gray.json | 0 .../models/block/network_receiver/green.json | 0 .../block/network_receiver/inactive.json | 0 .../block/network_receiver/light_blue.json | 0 .../block/network_receiver/light_gray.json | 0 .../models/block/network_receiver/lime.json | 0 .../block/network_receiver/magenta.json | 0 .../models/block/network_receiver/orange.json | 0 .../models/block/network_receiver/pink.json | 0 .../models/block/network_receiver/purple.json | 0 .../models/block/network_receiver/red.json | 0 .../models/block/network_receiver/white.json | 0 .../models/block/network_receiver/yellow.json | 0 .../block/network_transmitter/black.json | 0 .../block/network_transmitter/blue.json | 0 .../block/network_transmitter/brown.json | 0 .../block/network_transmitter/cyan.json | 0 .../block/network_transmitter/error.json | 0 .../block/network_transmitter/gray.json | 0 .../block/network_transmitter/green.json | 0 .../block/network_transmitter/inactive.json | 0 .../block/network_transmitter/light_blue.json | 0 .../block/network_transmitter/light_gray.json | 0 .../block/network_transmitter/lime.json | 0 .../block/network_transmitter/magenta.json | 0 .../block/network_transmitter/orange.json | 0 .../block/network_transmitter/pink.json | 0 .../block/network_transmitter/purple.json | 0 .../models/block/network_transmitter/red.json | 0 .../block/network_transmitter/white.json | 0 .../block/network_transmitter/yellow.json | 0 .../models/block/relay/black.json | 0 .../models/block/relay/blue.json | 0 .../models/block/relay/brown.json | 0 .../models/block/relay/cyan.json | 0 .../models/block/relay/gray.json | 0 .../models/block/relay/green.json | 0 .../models/block/relay/inactive.json | 0 .../models/block/relay/light_blue.json | 0 .../models/block/relay/light_gray.json | 0 .../models/block/relay/lime.json | 0 .../models/block/relay/magenta.json | 0 .../models/block/relay/orange.json | 0 .../models/block/relay/pink.json | 0 .../models/block/relay/purple.json | 0 .../models/block/relay/red.json | 0 .../models/block/relay/white.json | 0 .../models/block/relay/yellow.json | 0 .../models/block/security_manager/black.json | 0 .../models/block/security_manager/blue.json | 0 .../models/block/security_manager/brown.json | 0 .../models/block/security_manager/cyan.json | 0 .../models/block/security_manager/gray.json | 0 .../models/block/security_manager/green.json | 0 .../block/security_manager/inactive.json | 0 .../block/security_manager/light_blue.json | 0 .../block/security_manager/light_gray.json | 0 .../models/block/security_manager/lime.json | 0 .../block/security_manager/magenta.json | 0 .../models/block/security_manager/orange.json | 0 .../models/block/security_manager/pink.json | 0 .../models/block/security_manager/purple.json | 0 .../models/block/security_manager/red.json | 0 .../models/block/security_manager/white.json | 0 .../models/block/security_manager/yellow.json | 0 .../block/wireless_transmitter/black.json | 0 .../block/wireless_transmitter/blue.json | 0 .../block/wireless_transmitter/brown.json | 0 .../block/wireless_transmitter/cyan.json | 0 .../block/wireless_transmitter/gray.json | 0 .../block/wireless_transmitter/green.json | 0 .../wireless_transmitter/light_blue.json | 0 .../wireless_transmitter/light_gray.json | 0 .../block/wireless_transmitter/lime.json | 0 .../block/wireless_transmitter/magenta.json | 0 .../block/wireless_transmitter/orange.json | 0 .../block/wireless_transmitter/pink.json | 0 .../block/wireless_transmitter/purple.json | 0 .../block/wireless_transmitter/red.json | 0 .../block/wireless_transmitter/white.json | 0 .../block/wireless_transmitter/yellow.json | 0 .../models/item/black_cable.json | 0 .../models/item/black_constructor.json | 0 .../models/item/black_controller.json | 0 .../models/item/black_crafting_grid.json | 0 .../item/black_creative_controller.json | 0 .../models/item/black_destructor.json | 0 .../models/item/black_detector.json | 0 .../models/item/black_disk_interface.json | 0 .../models/item/black_exporter.json | 0 .../models/item/black_external_storage.json | 0 .../models/item/black_grid.json | 0 .../models/item/black_importer.json | 0 .../models/item/black_network_receiver.json | 0 .../item/black_network_transmitter.json | 0 .../models/item/black_relay.json | 0 .../models/item/black_security_manager.json | 0 .../item/black_wireless_transmitter.json | 0 .../models/item/blue_cable.json | 0 .../models/item/blue_constructor.json | 0 .../models/item/blue_controller.json | 0 .../models/item/blue_crafting_grid.json | 0 .../models/item/blue_creative_controller.json | 0 .../models/item/blue_destructor.json | 0 .../models/item/blue_detector.json | 0 .../models/item/blue_disk_interface.json | 0 .../models/item/blue_exporter.json | 0 .../models/item/blue_external_storage.json | 0 .../refinedstorage/models/item/blue_grid.json | 0 .../models/item/blue_importer.json | 0 .../models/item/blue_network_receiver.json | 0 .../models/item/blue_network_transmitter.json | 0 .../models/item/blue_relay.json | 0 .../models/item/blue_security_manager.json | 0 .../item/blue_wireless_transmitter.json | 0 .../models/item/brown_cable.json | 0 .../models/item/brown_constructor.json | 0 .../models/item/brown_controller.json | 0 .../models/item/brown_crafting_grid.json | 0 .../item/brown_creative_controller.json | 0 .../models/item/brown_destructor.json | 0 .../models/item/brown_detector.json | 0 .../models/item/brown_disk_interface.json | 0 .../models/item/brown_exporter.json | 0 .../models/item/brown_external_storage.json | 0 .../models/item/brown_grid.json | 0 .../models/item/brown_importer.json | 0 .../models/item/brown_network_receiver.json | 0 .../item/brown_network_transmitter.json | 0 .../models/item/brown_relay.json | 0 .../models/item/brown_security_manager.json | 0 .../item/brown_wireless_transmitter.json | 0 .../refinedstorage/models/item/cable.json | 0 .../models/item/constructor.json | 0 .../models/item/controller.json | 0 .../models/item/crafting_grid.json | 0 .../models/item/creative_controller.json | 0 .../models/item/cyan_cable.json | 0 .../models/item/cyan_constructor.json | 0 .../models/item/cyan_controller.json | 0 .../models/item/cyan_crafting_grid.json | 0 .../models/item/cyan_creative_controller.json | 0 .../models/item/cyan_destructor.json | 0 .../models/item/cyan_detector.json | 0 .../models/item/cyan_disk_interface.json | 0 .../models/item/cyan_exporter.json | 0 .../models/item/cyan_external_storage.json | 0 .../refinedstorage/models/item/cyan_grid.json | 0 .../models/item/cyan_importer.json | 0 .../models/item/cyan_network_receiver.json | 0 .../models/item/cyan_network_transmitter.json | 0 .../models/item/cyan_relay.json | 0 .../models/item/cyan_security_manager.json | 0 .../item/cyan_wireless_transmitter.json | 0 .../models/item/destructor.json | 0 .../refinedstorage/models/item/detector.json | 0 .../models/item/disk_interface.json | 0 .../refinedstorage/models/item/exporter.json | 0 .../models/item/external_storage.json | 0 .../models/item/gray_controller.json | 0 .../models/item/gray_crafting_grid.json | 0 .../models/item/gray_creative_controller.json | 0 .../models/item/gray_detector.json | 0 .../models/item/gray_disk_interface.json | 0 .../refinedstorage/models/item/gray_grid.json | 0 .../models/item/gray_network_receiver.json | 0 .../models/item/gray_network_transmitter.json | 0 .../models/item/gray_relay.json | 0 .../models/item/gray_security_manager.json | 0 .../item/gray_wireless_transmitter.json | 0 .../models/item/green_cable.json | 0 .../models/item/green_constructor.json | 0 .../models/item/green_controller.json | 0 .../models/item/green_crafting_grid.json | 0 .../item/green_creative_controller.json | 0 .../models/item/green_destructor.json | 0 .../models/item/green_detector.json | 0 .../models/item/green_disk_interface.json | 0 .../models/item/green_exporter.json | 0 .../models/item/green_external_storage.json | 0 .../models/item/green_grid.json | 0 .../models/item/green_importer.json | 0 .../models/item/green_network_receiver.json | 0 .../item/green_network_transmitter.json | 0 .../models/item/green_relay.json | 0 .../models/item/green_security_manager.json | 0 .../item/green_wireless_transmitter.json | 0 .../refinedstorage/models/item/grid.json | 0 .../refinedstorage/models/item/importer.json | 0 .../models/item/light_blue_cable.json | 0 .../models/item/light_blue_constructor.json | 0 .../models/item/light_blue_destructor.json | 0 .../models/item/light_blue_exporter.json | 0 .../item/light_blue_external_storage.json | 0 .../models/item/light_blue_importer.json | 0 .../models/item/light_gray_cable.json | 0 .../models/item/light_gray_constructor.json | 0 .../models/item/light_gray_controller.json | 0 .../models/item/light_gray_crafting_grid.json | 0 .../item/light_gray_creative_controller.json | 0 .../models/item/light_gray_destructor.json | 0 .../models/item/light_gray_detector.json | 0 .../item/light_gray_disk_interface.json | 0 .../models/item/light_gray_exporter.json | 0 .../item/light_gray_external_storage.json | 0 .../models/item/light_gray_grid.json | 0 .../models/item/light_gray_importer.json | 0 .../item/light_gray_network_receiver.json | 0 .../item/light_gray_network_transmitter.json | 0 .../models/item/light_gray_relay.json | 0 .../item/light_gray_security_manager.json | 0 .../item/light_gray_wireless_transmitter.json | 0 .../models/item/lime_cable.json | 0 .../models/item/lime_constructor.json | 0 .../models/item/lime_controller.json | 0 .../models/item/lime_crafting_grid.json | 0 .../models/item/lime_creative_controller.json | 0 .../models/item/lime_destructor.json | 0 .../models/item/lime_detector.json | 0 .../models/item/lime_disk_interface.json | 0 .../models/item/lime_exporter.json | 0 .../models/item/lime_external_storage.json | 0 .../refinedstorage/models/item/lime_grid.json | 0 .../models/item/lime_importer.json | 0 .../models/item/lime_network_receiver.json | 0 .../models/item/lime_network_transmitter.json | 0 .../models/item/lime_relay.json | 0 .../models/item/lime_security_manager.json | 0 .../item/lime_wireless_transmitter.json | 0 .../models/item/magenta_cable.json | 0 .../models/item/magenta_constructor.json | 0 .../models/item/magenta_controller.json | 0 .../models/item/magenta_crafting_grid.json | 0 .../item/magenta_creative_controller.json | 0 .../models/item/magenta_destructor.json | 0 .../models/item/magenta_detector.json | 0 .../models/item/magenta_disk_interface.json | 0 .../models/item/magenta_exporter.json | 0 .../models/item/magenta_external_storage.json | 0 .../models/item/magenta_grid.json | 0 .../models/item/magenta_importer.json | 0 .../models/item/magenta_network_receiver.json | 0 .../item/magenta_network_transmitter.json | 0 .../models/item/magenta_relay.json | 0 .../models/item/magenta_security_manager.json | 0 .../item/magenta_wireless_transmitter.json | 0 .../models/item/network_receiver.json | 0 .../models/item/network_transmitter.json | 0 .../models/item/orange_cable.json | 0 .../models/item/orange_constructor.json | 0 .../models/item/orange_controller.json | 0 .../models/item/orange_crafting_grid.json | 0 .../item/orange_creative_controller.json | 0 .../models/item/orange_destructor.json | 0 .../models/item/orange_detector.json | 0 .../models/item/orange_disk_interface.json | 0 .../models/item/orange_exporter.json | 0 .../models/item/orange_external_storage.json | 0 .../models/item/orange_grid.json | 0 .../models/item/orange_importer.json | 0 .../models/item/orange_network_receiver.json | 0 .../item/orange_network_transmitter.json | 0 .../models/item/orange_relay.json | 0 .../models/item/orange_security_manager.json | 0 .../item/orange_wireless_transmitter.json | 0 .../models/item/pink_cable.json | 0 .../models/item/pink_constructor.json | 0 .../models/item/pink_controller.json | 0 .../models/item/pink_crafting_grid.json | 0 .../models/item/pink_creative_controller.json | 0 .../models/item/pink_destructor.json | 0 .../models/item/pink_detector.json | 0 .../models/item/pink_disk_interface.json | 0 .../models/item/pink_exporter.json | 0 .../models/item/pink_external_storage.json | 0 .../refinedstorage/models/item/pink_grid.json | 0 .../models/item/pink_importer.json | 0 .../models/item/pink_network_receiver.json | 0 .../models/item/pink_network_transmitter.json | 0 .../models/item/pink_relay.json | 0 .../models/item/pink_security_manager.json | 0 .../item/pink_wireless_transmitter.json | 0 .../models/item/purple_cable.json | 0 .../models/item/purple_constructor.json | 0 .../models/item/purple_controller.json | 0 .../models/item/purple_crafting_grid.json | 0 .../item/purple_creative_controller.json | 0 .../models/item/purple_destructor.json | 0 .../models/item/purple_detector.json | 0 .../models/item/purple_disk_interface.json | 0 .../models/item/purple_exporter.json | 0 .../models/item/purple_external_storage.json | 0 .../models/item/purple_grid.json | 0 .../models/item/purple_importer.json | 0 .../models/item/purple_network_receiver.json | 0 .../item/purple_network_transmitter.json | 0 .../models/item/purple_relay.json | 0 .../models/item/purple_security_manager.json | 0 .../item/purple_wireless_transmitter.json | 0 .../refinedstorage/models/item/red_cable.json | 0 .../models/item/red_constructor.json | 0 .../models/item/red_controller.json | 0 .../models/item/red_crafting_grid.json | 0 .../models/item/red_creative_controller.json | 0 .../models/item/red_destructor.json | 0 .../models/item/red_detector.json | 0 .../models/item/red_disk_interface.json | 0 .../models/item/red_exporter.json | 0 .../models/item/red_external_storage.json | 0 .../refinedstorage/models/item/red_grid.json | 0 .../models/item/red_importer.json | 0 .../models/item/red_network_receiver.json | 0 .../models/item/red_network_transmitter.json | 0 .../refinedstorage/models/item/red_relay.json | 0 .../models/item/red_security_manager.json | 0 .../models/item/red_wireless_transmitter.json | 0 .../refinedstorage/models/item/relay.json | 0 .../models/item/security_manager.json | 0 .../models/item/white_cable.json | 0 .../models/item/white_constructor.json | 0 .../models/item/white_controller.json | 0 .../models/item/white_crafting_grid.json | 0 .../item/white_creative_controller.json | 0 .../models/item/white_destructor.json | 0 .../models/item/white_detector.json | 0 .../models/item/white_disk_interface.json | 0 .../models/item/white_exporter.json | 0 .../models/item/white_external_storage.json | 0 .../models/item/white_grid.json | 0 .../models/item/white_importer.json | 0 .../models/item/white_network_receiver.json | 0 .../item/white_network_transmitter.json | 0 .../models/item/white_relay.json | 0 .../models/item/white_security_manager.json | 0 .../item/white_wireless_transmitter.json | 0 .../models/item/wireless_transmitter.json | 0 .../models/item/yellow_cable.json | 0 .../models/item/yellow_constructor.json | 0 .../models/item/yellow_controller.json | 0 .../models/item/yellow_crafting_grid.json | 0 .../item/yellow_creative_controller.json | 0 .../models/item/yellow_destructor.json | 0 .../models/item/yellow_detector.json | 0 .../models/item/yellow_disk_interface.json | 0 .../models/item/yellow_exporter.json | 0 .../models/item/yellow_external_storage.json | 0 .../models/item/yellow_grid.json | 0 .../models/item/yellow_importer.json | 0 .../models/item/yellow_network_receiver.json | 0 .../item/yellow_network_transmitter.json | 0 .../models/item/yellow_relay.json | 0 .../models/item/yellow_security_manager.json | 0 .../item/yellow_wireless_transmitter.json | 0 .../recipes/misc/coloring/black_cable.json | 0 .../misc/coloring/black_constructor.json | 0 .../misc/coloring/black_controller.json | 0 .../misc/coloring/black_crafting_grid.json | 0 .../misc/coloring/black_destructor.json | 0 .../recipes/misc/coloring/black_detector.json | 0 .../misc/coloring/black_disk_interface.json | 0 .../recipes/misc/coloring/black_exporter.json | 0 .../misc/coloring/black_external_storage.json | 0 .../recipes/misc/coloring/black_grid.json | 0 .../recipes/misc/coloring/black_importer.json | 0 .../misc/coloring/black_network_receiver.json | 0 .../coloring/black_network_transmitter.json | 0 .../recipes/misc/coloring/black_relay.json | 0 .../misc/coloring/black_security_manager.json | 0 .../coloring/black_wireless_transmitter.json | 0 .../recipes/misc/coloring/blue_cable.json | 0 .../misc/coloring/blue_constructor.json | 0 .../misc/coloring/blue_controller.json | 0 .../misc/coloring/blue_crafting_grid.json | 0 .../misc/coloring/blue_destructor.json | 0 .../recipes/misc/coloring/blue_detector.json | 0 .../misc/coloring/blue_disk_interface.json | 0 .../recipes/misc/coloring/blue_exporter.json | 0 .../misc/coloring/blue_external_storage.json | 0 .../recipes/misc/coloring/blue_grid.json | 0 .../recipes/misc/coloring/blue_importer.json | 0 .../misc/coloring/blue_network_receiver.json | 0 .../coloring/blue_network_transmitter.json | 0 .../recipes/misc/coloring/blue_relay.json | 0 .../misc/coloring/blue_security_manager.json | 0 .../coloring/blue_wireless_transmitter.json | 0 .../recipes/misc/coloring/brown_cable.json | 0 .../misc/coloring/brown_constructor.json | 0 .../misc/coloring/brown_controller.json | 0 .../misc/coloring/brown_crafting_grid.json | 0 .../misc/coloring/brown_destructor.json | 0 .../recipes/misc/coloring/brown_detector.json | 0 .../misc/coloring/brown_disk_interface.json | 0 .../recipes/misc/coloring/brown_exporter.json | 0 .../misc/coloring/brown_external_storage.json | 0 .../recipes/misc/coloring/brown_grid.json | 0 .../recipes/misc/coloring/brown_importer.json | 0 .../misc/coloring/brown_network_receiver.json | 0 .../coloring/brown_network_transmitter.json | 0 .../recipes/misc/coloring/brown_relay.json | 0 .../misc/coloring/brown_security_manager.json | 0 .../coloring/brown_wireless_transmitter.json | 0 .../recipes/misc/coloring/cyan_cable.json | 0 .../misc/coloring/cyan_constructor.json | 0 .../misc/coloring/cyan_controller.json | 0 .../misc/coloring/cyan_crafting_grid.json | 0 .../misc/coloring/cyan_destructor.json | 0 .../recipes/misc/coloring/cyan_detector.json | 0 .../misc/coloring/cyan_disk_interface.json | 0 .../recipes/misc/coloring/cyan_exporter.json | 0 .../misc/coloring/cyan_external_storage.json | 0 .../recipes/misc/coloring/cyan_grid.json | 0 .../recipes/misc/coloring/cyan_importer.json | 0 .../misc/coloring/cyan_network_receiver.json | 0 .../coloring/cyan_network_transmitter.json | 0 .../recipes/misc/coloring/cyan_relay.json | 0 .../misc/coloring/cyan_security_manager.json | 0 .../coloring/cyan_wireless_transmitter.json | 0 .../recipes/misc/coloring/gray_cable.json | 0 .../misc/coloring/gray_constructor.json | 0 .../misc/coloring/gray_controller.json | 0 .../misc/coloring/gray_crafting_grid.json | 0 .../misc/coloring/gray_destructor.json | 0 .../recipes/misc/coloring/gray_detector.json | 0 .../misc/coloring/gray_disk_interface.json | 0 .../recipes/misc/coloring/gray_exporter.json | 0 .../misc/coloring/gray_external_storage.json | 0 .../recipes/misc/coloring/gray_grid.json | 0 .../recipes/misc/coloring/gray_importer.json | 0 .../misc/coloring/gray_network_receiver.json | 0 .../coloring/gray_network_transmitter.json | 0 .../recipes/misc/coloring/gray_relay.json | 0 .../misc/coloring/gray_security_manager.json | 0 .../coloring/gray_wireless_transmitter.json | 0 .../recipes/misc/coloring/green_cable.json | 0 .../misc/coloring/green_constructor.json | 0 .../misc/coloring/green_controller.json | 0 .../misc/coloring/green_crafting_grid.json | 0 .../misc/coloring/green_destructor.json | 0 .../recipes/misc/coloring/green_detector.json | 0 .../misc/coloring/green_disk_interface.json | 0 .../recipes/misc/coloring/green_exporter.json | 0 .../misc/coloring/green_external_storage.json | 0 .../recipes/misc/coloring/green_grid.json | 0 .../recipes/misc/coloring/green_importer.json | 0 .../misc/coloring/green_network_receiver.json | 0 .../coloring/green_network_transmitter.json | 0 .../recipes/misc/coloring/green_relay.json | 0 .../misc/coloring/green_security_manager.json | 0 .../coloring/green_wireless_transmitter.json | 0 .../misc/coloring/light_blue_cable.json | 0 .../misc/coloring/light_blue_constructor.json | 0 .../misc/coloring/light_blue_controller.json | 0 .../coloring/light_blue_crafting_grid.json | 0 .../misc/coloring/light_blue_destructor.json | 0 .../misc/coloring/light_blue_detector.json | 0 .../coloring/light_blue_disk_interface.json | 0 .../misc/coloring/light_blue_exporter.json | 0 .../coloring/light_blue_external_storage.json | 0 .../misc/coloring/light_blue_grid.json | 0 .../misc/coloring/light_blue_importer.json | 0 .../coloring/light_blue_network_receiver.json | 0 .../light_blue_network_transmitter.json | 0 .../misc/coloring/light_blue_relay.json | 0 .../coloring/light_blue_security_manager.json | 0 .../light_blue_wireless_transmitter.json | 0 .../misc/coloring/light_gray_cable.json | 0 .../misc/coloring/light_gray_constructor.json | 0 .../misc/coloring/light_gray_controller.json | 0 .../coloring/light_gray_crafting_grid.json | 0 .../misc/coloring/light_gray_destructor.json | 0 .../misc/coloring/light_gray_detector.json | 0 .../coloring/light_gray_disk_interface.json | 0 .../misc/coloring/light_gray_exporter.json | 0 .../coloring/light_gray_external_storage.json | 0 .../misc/coloring/light_gray_grid.json | 0 .../misc/coloring/light_gray_importer.json | 0 .../coloring/light_gray_network_receiver.json | 0 .../light_gray_network_transmitter.json | 0 .../misc/coloring/light_gray_relay.json | 0 .../coloring/light_gray_security_manager.json | 0 .../light_gray_wireless_transmitter.json | 0 .../recipes/misc/coloring/lime_cable.json | 0 .../misc/coloring/lime_constructor.json | 0 .../misc/coloring/lime_controller.json | 0 .../misc/coloring/lime_crafting_grid.json | 0 .../misc/coloring/lime_destructor.json | 0 .../recipes/misc/coloring/lime_detector.json | 0 .../misc/coloring/lime_disk_interface.json | 0 .../recipes/misc/coloring/lime_exporter.json | 0 .../misc/coloring/lime_external_storage.json | 0 .../recipes/misc/coloring/lime_grid.json | 0 .../recipes/misc/coloring/lime_importer.json | 0 .../misc/coloring/lime_network_receiver.json | 0 .../coloring/lime_network_transmitter.json | 0 .../recipes/misc/coloring/lime_relay.json | 0 .../misc/coloring/lime_security_manager.json | 0 .../coloring/lime_wireless_transmitter.json | 0 .../recipes/misc/coloring/magenta_cable.json | 0 .../misc/coloring/magenta_constructor.json | 0 .../misc/coloring/magenta_controller.json | 0 .../misc/coloring/magenta_crafting_grid.json | 0 .../misc/coloring/magenta_destructor.json | 0 .../misc/coloring/magenta_detector.json | 0 .../misc/coloring/magenta_disk_interface.json | 0 .../misc/coloring/magenta_exporter.json | 0 .../coloring/magenta_external_storage.json | 0 .../recipes/misc/coloring/magenta_grid.json | 0 .../misc/coloring/magenta_importer.json | 0 .../coloring/magenta_network_receiver.json | 0 .../coloring/magenta_network_transmitter.json | 0 .../recipes/misc/coloring/magenta_relay.json | 0 .../coloring/magenta_security_manager.json | 0 .../magenta_wireless_transmitter.json | 0 .../recipes/misc/coloring/orange_cable.json | 0 .../misc/coloring/orange_constructor.json | 0 .../misc/coloring/orange_controller.json | 0 .../misc/coloring/orange_crafting_grid.json | 0 .../misc/coloring/orange_destructor.json | 0 .../misc/coloring/orange_detector.json | 0 .../misc/coloring/orange_disk_interface.json | 0 .../misc/coloring/orange_exporter.json | 0 .../coloring/orange_external_storage.json | 0 .../recipes/misc/coloring/orange_grid.json | 0 .../misc/coloring/orange_importer.json | 0 .../coloring/orange_network_receiver.json | 0 .../coloring/orange_network_transmitter.json | 0 .../recipes/misc/coloring/orange_relay.json | 0 .../coloring/orange_security_manager.json | 0 .../coloring/orange_wireless_transmitter.json | 0 .../recipes/misc/coloring/pink_cable.json | 0 .../misc/coloring/pink_constructor.json | 0 .../misc/coloring/pink_controller.json | 0 .../misc/coloring/pink_crafting_grid.json | 0 .../misc/coloring/pink_destructor.json | 0 .../recipes/misc/coloring/pink_detector.json | 0 .../misc/coloring/pink_disk_interface.json | 0 .../recipes/misc/coloring/pink_exporter.json | 0 .../misc/coloring/pink_external_storage.json | 0 .../recipes/misc/coloring/pink_grid.json | 0 .../recipes/misc/coloring/pink_importer.json | 0 .../misc/coloring/pink_network_receiver.json | 0 .../coloring/pink_network_transmitter.json | 0 .../recipes/misc/coloring/pink_relay.json | 0 .../misc/coloring/pink_security_manager.json | 0 .../coloring/pink_wireless_transmitter.json | 0 .../recipes/misc/coloring/purple_cable.json | 0 .../misc/coloring/purple_constructor.json | 0 .../misc/coloring/purple_controller.json | 0 .../misc/coloring/purple_crafting_grid.json | 0 .../misc/coloring/purple_destructor.json | 0 .../misc/coloring/purple_detector.json | 0 .../misc/coloring/purple_disk_interface.json | 0 .../misc/coloring/purple_exporter.json | 0 .../coloring/purple_external_storage.json | 0 .../recipes/misc/coloring/purple_grid.json | 0 .../misc/coloring/purple_importer.json | 0 .../coloring/purple_network_receiver.json | 0 .../coloring/purple_network_transmitter.json | 0 .../recipes/misc/coloring/purple_relay.json | 0 .../coloring/purple_security_manager.json | 0 .../coloring/purple_wireless_transmitter.json | 0 .../recipes/misc/coloring/red_cable.json | 0 .../misc/coloring/red_constructor.json | 0 .../recipes/misc/coloring/red_controller.json | 0 .../misc/coloring/red_crafting_grid.json | 0 .../recipes/misc/coloring/red_destructor.json | 0 .../recipes/misc/coloring/red_detector.json | 0 .../misc/coloring/red_disk_interface.json | 0 .../recipes/misc/coloring/red_exporter.json | 0 .../misc/coloring/red_external_storage.json | 0 .../recipes/misc/coloring/red_grid.json | 0 .../recipes/misc/coloring/red_importer.json | 0 .../misc/coloring/red_network_receiver.json | 0 .../coloring/red_network_transmitter.json | 0 .../recipes/misc/coloring/red_relay.json | 0 .../misc/coloring/red_security_manager.json | 0 .../coloring/red_wireless_transmitter.json | 0 .../recipes/misc/coloring/white_cable.json | 0 .../misc/coloring/white_constructor.json | 0 .../misc/coloring/white_controller.json | 0 .../misc/coloring/white_crafting_grid.json | 0 .../misc/coloring/white_destructor.json | 0 .../recipes/misc/coloring/white_detector.json | 0 .../misc/coloring/white_disk_interface.json | 0 .../recipes/misc/coloring/white_exporter.json | 0 .../misc/coloring/white_external_storage.json | 0 .../recipes/misc/coloring/white_grid.json | 0 .../recipes/misc/coloring/white_importer.json | 0 .../misc/coloring/white_network_receiver.json | 0 .../coloring/white_network_transmitter.json | 0 .../recipes/misc/coloring/white_relay.json | 0 .../misc/coloring/white_security_manager.json | 0 .../coloring/white_wireless_transmitter.json | 0 .../recipes/misc/coloring/yellow_cable.json | 0 .../misc/coloring/yellow_constructor.json | 0 .../misc/coloring/yellow_controller.json | 0 .../misc/coloring/yellow_crafting_grid.json | 0 .../misc/coloring/yellow_destructor.json | 0 .../misc/coloring/yellow_detector.json | 0 .../misc/coloring/yellow_disk_interface.json | 0 .../misc/coloring/yellow_exporter.json | 0 .../coloring/yellow_external_storage.json | 0 .../recipes/misc/coloring/yellow_grid.json | 0 .../misc/coloring/yellow_importer.json | 0 .../coloring/yellow_network_receiver.json | 0 .../coloring/yellow_network_transmitter.json | 0 .../recipes/misc/coloring/yellow_relay.json | 0 .../coloring/yellow_security_manager.json | 0 .../coloring/yellow_wireless_transmitter.json | 0 .../loot_table/blocks/black_cable.json | 0 .../loot_table/blocks/black_constructor.json | 0 .../loot_table/blocks/black_controller.json | 0 .../blocks/black_crafting_grid.json | 0 .../blocks/black_creative_controller.json | 0 .../loot_table/blocks/black_destructor.json | 0 .../loot_table/blocks/black_detector.json | 0 .../blocks/black_disk_interface.json | 0 .../loot_table/blocks/black_grid.json | 0 .../blocks/black_network_receiver.json | 0 .../blocks/black_network_transmitter.json | 0 .../loot_table/blocks/black_relay.json | 0 .../blocks/black_security_manager.json | 0 .../blocks/black_wireless_transmitter.json | 0 .../loot_table/blocks/blue_cable.json | 0 .../loot_table/blocks/blue_constructor.json | 0 .../loot_table/blocks/blue_controller.json | 0 .../loot_table/blocks/blue_crafting_grid.json | 0 .../blocks/blue_creative_controller.json | 0 .../loot_table/blocks/blue_destructor.json | 0 .../loot_table/blocks/blue_detector.json | 0 .../blocks/blue_disk_interface.json | 0 .../loot_table/blocks/blue_grid.json | 0 .../blocks/blue_network_receiver.json | 0 .../blocks/blue_network_transmitter.json | 0 .../loot_table/blocks/blue_relay.json | 0 .../blocks/blue_security_manager.json | 0 .../blocks/blue_wireless_transmitter.json | 0 .../loot_table/blocks/brown_cable.json | 0 .../loot_table/blocks/brown_constructor.json | 0 .../loot_table/blocks/brown_controller.json | 0 .../blocks/brown_crafting_grid.json | 0 .../blocks/brown_creative_controller.json | 0 .../loot_table/blocks/brown_destructor.json | 0 .../loot_table/blocks/brown_detector.json | 0 .../blocks/brown_disk_interface.json | 0 .../loot_table/blocks/brown_grid.json | 0 .../blocks/brown_network_receiver.json | 0 .../blocks/brown_network_transmitter.json | 0 .../loot_table/blocks/brown_relay.json | 0 .../blocks/brown_security_manager.json | 0 .../blocks/brown_wireless_transmitter.json | 0 .../loot_table/blocks/cable.json | 0 .../loot_table/blocks/constructor.json | 0 .../loot_table/blocks/controller.json | 0 .../loot_table/blocks/crafting_grid.json | 0 .../blocks/creative_controller.json | 0 .../loot_table/blocks/cyan_cable.json | 0 .../loot_table/blocks/cyan_constructor.json | 0 .../loot_table/blocks/cyan_controller.json | 0 .../loot_table/blocks/cyan_crafting_grid.json | 0 .../blocks/cyan_creative_controller.json | 0 .../loot_table/blocks/cyan_destructor.json | 0 .../loot_table/blocks/cyan_detector.json | 0 .../blocks/cyan_disk_interface.json | 0 .../loot_table/blocks/cyan_grid.json | 0 .../blocks/cyan_network_receiver.json | 0 .../blocks/cyan_network_transmitter.json | 0 .../loot_table/blocks/cyan_relay.json | 0 .../blocks/cyan_security_manager.json | 0 .../blocks/cyan_wireless_transmitter.json | 0 .../loot_table/blocks/destructor.json | 0 .../loot_table/blocks/detector.json | 0 .../loot_table/blocks/disk_interface.json | 0 .../loot_table/blocks/gray_controller.json | 0 .../loot_table/blocks/gray_crafting_grid.json | 0 .../blocks/gray_creative_controller.json | 0 .../loot_table/blocks/gray_detector.json | 0 .../blocks/gray_disk_interface.json | 0 .../loot_table/blocks/gray_grid.json | 0 .../blocks/gray_network_receiver.json | 0 .../blocks/gray_network_transmitter.json | 0 .../loot_table/blocks/gray_relay.json | 0 .../blocks/gray_security_manager.json | 0 .../blocks/gray_wireless_transmitter.json | 0 .../loot_table/blocks/green_cable.json | 0 .../loot_table/blocks/green_constructor.json | 0 .../loot_table/blocks/green_controller.json | 0 .../blocks/green_crafting_grid.json | 0 .../blocks/green_creative_controller.json | 0 .../loot_table/blocks/green_destructor.json | 0 .../loot_table/blocks/green_detector.json | 0 .../blocks/green_disk_interface.json | 0 .../loot_table/blocks/green_grid.json | 0 .../blocks/green_network_receiver.json | 0 .../blocks/green_network_transmitter.json | 0 .../loot_table/blocks/green_relay.json | 0 .../blocks/green_security_manager.json | 0 .../blocks/green_wireless_transmitter.json | 0 .../loot_table/blocks/grid.json | 0 .../loot_table/blocks/light_blue_cable.json | 0 .../blocks/light_blue_constructor.json | 0 .../blocks/light_blue_destructor.json | 0 .../loot_table/blocks/light_gray_cable.json | 0 .../blocks/light_gray_constructor.json | 0 .../blocks/light_gray_controller.json | 0 .../blocks/light_gray_crafting_grid.json | 0 .../light_gray_creative_controller.json | 0 .../blocks/light_gray_destructor.json | 0 .../blocks/light_gray_detector.json | 0 .../blocks/light_gray_disk_interface.json | 0 .../loot_table/blocks/light_gray_grid.json | 0 .../blocks/light_gray_network_receiver.json | 0 .../light_gray_network_transmitter.json | 0 .../loot_table/blocks/light_gray_relay.json | 0 .../blocks/light_gray_security_manager.json | 0 .../light_gray_wireless_transmitter.json | 0 .../loot_table/blocks/lime_cable.json | 0 .../loot_table/blocks/lime_constructor.json | 0 .../loot_table/blocks/lime_controller.json | 0 .../loot_table/blocks/lime_crafting_grid.json | 0 .../blocks/lime_creative_controller.json | 0 .../loot_table/blocks/lime_destructor.json | 0 .../loot_table/blocks/lime_detector.json | 0 .../blocks/lime_disk_interface.json | 0 .../loot_table/blocks/lime_grid.json | 0 .../blocks/lime_network_receiver.json | 0 .../blocks/lime_network_transmitter.json | 0 .../loot_table/blocks/lime_relay.json | 0 .../blocks/lime_security_manager.json | 0 .../blocks/lime_wireless_transmitter.json | 0 .../loot_table/blocks/magenta_cable.json | 0 .../blocks/magenta_constructor.json | 0 .../loot_table/blocks/magenta_controller.json | 0 .../blocks/magenta_crafting_grid.json | 0 .../blocks/magenta_creative_controller.json | 0 .../loot_table/blocks/magenta_destructor.json | 0 .../loot_table/blocks/magenta_detector.json | 0 .../blocks/magenta_disk_interface.json | 0 .../loot_table/blocks/magenta_grid.json | 0 .../blocks/magenta_network_receiver.json | 0 .../blocks/magenta_network_transmitter.json | 0 .../loot_table/blocks/magenta_relay.json | 0 .../blocks/magenta_security_manager.json | 0 .../blocks/magenta_wireless_transmitter.json | 0 .../loot_table/blocks/network_receiver.json | 0 .../blocks/network_transmitter.json | 0 .../loot_table/blocks/orange_cable.json | 0 .../loot_table/blocks/orange_constructor.json | 0 .../loot_table/blocks/orange_controller.json | 0 .../blocks/orange_crafting_grid.json | 0 .../blocks/orange_creative_controller.json | 0 .../loot_table/blocks/orange_destructor.json | 0 .../loot_table/blocks/orange_detector.json | 0 .../blocks/orange_disk_interface.json | 0 .../loot_table/blocks/orange_grid.json | 0 .../blocks/orange_network_receiver.json | 0 .../blocks/orange_network_transmitter.json | 0 .../loot_table/blocks/orange_relay.json | 0 .../blocks/orange_security_manager.json | 0 .../blocks/orange_wireless_transmitter.json | 0 .../loot_table/blocks/pink_cable.json | 0 .../loot_table/blocks/pink_constructor.json | 0 .../loot_table/blocks/pink_controller.json | 0 .../loot_table/blocks/pink_crafting_grid.json | 0 .../blocks/pink_creative_controller.json | 0 .../loot_table/blocks/pink_destructor.json | 0 .../loot_table/blocks/pink_detector.json | 0 .../blocks/pink_disk_interface.json | 0 .../loot_table/blocks/pink_grid.json | 0 .../blocks/pink_network_receiver.json | 0 .../blocks/pink_network_transmitter.json | 0 .../loot_table/blocks/pink_relay.json | 0 .../blocks/pink_security_manager.json | 0 .../blocks/pink_wireless_transmitter.json | 0 .../loot_table/blocks/purple_cable.json | 0 .../loot_table/blocks/purple_constructor.json | 0 .../loot_table/blocks/purple_controller.json | 0 .../blocks/purple_crafting_grid.json | 0 .../blocks/purple_creative_controller.json | 0 .../loot_table/blocks/purple_destructor.json | 0 .../loot_table/blocks/purple_detector.json | 0 .../blocks/purple_disk_interface.json | 0 .../loot_table/blocks/purple_grid.json | 0 .../blocks/purple_network_receiver.json | 0 .../blocks/purple_network_transmitter.json | 0 .../loot_table/blocks/purple_relay.json | 0 .../blocks/purple_security_manager.json | 0 .../blocks/purple_wireless_transmitter.json | 0 .../loot_table/blocks/red_cable.json | 0 .../loot_table/blocks/red_constructor.json | 0 .../loot_table/blocks/red_controller.json | 0 .../loot_table/blocks/red_crafting_grid.json | 0 .../blocks/red_creative_controller.json | 0 .../loot_table/blocks/red_destructor.json | 0 .../loot_table/blocks/red_detector.json | 0 .../loot_table/blocks/red_disk_interface.json | 0 .../loot_table/blocks/red_grid.json | 0 .../blocks/red_network_receiver.json | 0 .../blocks/red_network_transmitter.json | 0 .../loot_table/blocks/red_relay.json | 0 .../blocks/red_security_manager.json | 0 .../blocks/red_wireless_transmitter.json | 0 .../loot_table/blocks/relay.json | 0 .../loot_table/blocks/security_manager.json | 0 .../loot_table/blocks/white_cable.json | 0 .../loot_table/blocks/white_constructor.json | 0 .../loot_table/blocks/white_controller.json | 0 .../blocks/white_crafting_grid.json | 0 .../blocks/white_creative_controller.json | 0 .../loot_table/blocks/white_destructor.json | 0 .../loot_table/blocks/white_detector.json | 0 .../blocks/white_disk_interface.json | 0 .../loot_table/blocks/white_grid.json | 0 .../blocks/white_network_receiver.json | 0 .../blocks/white_network_transmitter.json | 0 .../loot_table/blocks/white_relay.json | 0 .../blocks/white_security_manager.json | 0 .../blocks/white_wireless_transmitter.json | 0 .../blocks/wireless_transmitter.json | 0 .../loot_table/blocks/yellow_cable.json | 0 .../loot_table/blocks/yellow_constructor.json | 0 .../loot_table/blocks/yellow_controller.json | 0 .../blocks/yellow_crafting_grid.json | 0 .../blocks/yellow_creative_controller.json | 0 .../loot_table/blocks/yellow_destructor.json | 0 .../loot_table/blocks/yellow_detector.json | 0 .../blocks/yellow_disk_interface.json | 0 .../loot_table/blocks/yellow_grid.json | 0 .../blocks/yellow_network_receiver.json | 0 .../blocks/yellow_network_transmitter.json | 0 .../loot_table/blocks/yellow_relay.json | 0 .../blocks/yellow_security_manager.json | 0 .../blocks/yellow_wireless_transmitter.json | 0 .../recipe/coloring/black_cable.json | 0 .../recipe/coloring/black_constructor.json | 0 .../recipe/coloring/black_controller.json | 0 .../recipe/coloring/black_crafting_grid.json | 0 .../recipe/coloring/black_destructor.json | 0 .../recipe/coloring/black_detector.json | 0 .../recipe/coloring/black_disk_interface.json | 0 .../recipe/coloring/black_exporter.json | 0 .../coloring/black_external_storage.json | 0 .../recipe/coloring/black_grid.json | 0 .../recipe/coloring/black_importer.json | 0 .../coloring/black_network_receiver.json | 0 .../coloring/black_network_transmitter.json | 0 .../recipe/coloring/black_relay.json | 0 .../coloring/black_security_manager.json | 0 .../coloring/black_wireless_transmitter.json | 0 .../recipe/coloring/blue_cable.json | 0 .../recipe/coloring/blue_constructor.json | 0 .../recipe/coloring/blue_controller.json | 0 .../recipe/coloring/blue_crafting_grid.json | 0 .../recipe/coloring/blue_destructor.json | 0 .../recipe/coloring/blue_detector.json | 0 .../recipe/coloring/blue_disk_interface.json | 0 .../recipe/coloring/blue_exporter.json | 0 .../coloring/blue_external_storage.json | 0 .../recipe/coloring/blue_grid.json | 0 .../recipe/coloring/blue_importer.json | 0 .../coloring/blue_network_receiver.json | 0 .../coloring/blue_network_transmitter.json | 0 .../recipe/coloring/blue_relay.json | 0 .../coloring/blue_security_manager.json | 0 .../coloring/blue_wireless_transmitter.json | 0 .../recipe/coloring/brown_cable.json | 0 .../recipe/coloring/brown_constructor.json | 0 .../recipe/coloring/brown_controller.json | 0 .../recipe/coloring/brown_crafting_grid.json | 0 .../recipe/coloring/brown_destructor.json | 0 .../recipe/coloring/brown_detector.json | 0 .../recipe/coloring/brown_disk_interface.json | 0 .../recipe/coloring/brown_exporter.json | 0 .../coloring/brown_external_storage.json | 0 .../recipe/coloring/brown_grid.json | 0 .../recipe/coloring/brown_importer.json | 0 .../coloring/brown_network_receiver.json | 0 .../coloring/brown_network_transmitter.json | 0 .../recipe/coloring/brown_relay.json | 0 .../coloring/brown_security_manager.json | 0 .../coloring/brown_wireless_transmitter.json | 0 .../recipe/coloring/cyan_cable.json | 0 .../recipe/coloring/cyan_constructor.json | 0 .../recipe/coloring/cyan_controller.json | 0 .../recipe/coloring/cyan_crafting_grid.json | 0 .../recipe/coloring/cyan_destructor.json | 0 .../recipe/coloring/cyan_detector.json | 0 .../recipe/coloring/cyan_disk_interface.json | 0 .../recipe/coloring/cyan_exporter.json | 0 .../coloring/cyan_external_storage.json | 0 .../recipe/coloring/cyan_grid.json | 0 .../recipe/coloring/cyan_importer.json | 0 .../coloring/cyan_network_receiver.json | 0 .../coloring/cyan_network_transmitter.json | 0 .../recipe/coloring/cyan_relay.json | 0 .../coloring/cyan_security_manager.json | 0 .../coloring/cyan_wireless_transmitter.json | 0 .../recipe/coloring/gray_cable.json | 0 .../recipe/coloring/gray_constructor.json | 0 .../recipe/coloring/gray_controller.json | 0 .../recipe/coloring/gray_crafting_grid.json | 0 .../recipe/coloring/gray_destructor.json | 0 .../recipe/coloring/gray_detector.json | 0 .../recipe/coloring/gray_disk_interface.json | 0 .../recipe/coloring/gray_exporter.json | 0 .../coloring/gray_external_storage.json | 0 .../recipe/coloring/gray_grid.json | 0 .../recipe/coloring/gray_importer.json | 0 .../coloring/gray_network_receiver.json | 0 .../coloring/gray_network_transmitter.json | 0 .../recipe/coloring/gray_relay.json | 0 .../coloring/gray_security_manager.json | 0 .../coloring/gray_wireless_transmitter.json | 0 .../recipe/coloring/green_cable.json | 0 .../recipe/coloring/green_constructor.json | 0 .../recipe/coloring/green_controller.json | 0 .../recipe/coloring/green_crafting_grid.json | 0 .../recipe/coloring/green_destructor.json | 0 .../recipe/coloring/green_detector.json | 0 .../recipe/coloring/green_disk_interface.json | 0 .../recipe/coloring/green_exporter.json | 0 .../coloring/green_external_storage.json | 0 .../recipe/coloring/green_grid.json | 0 .../recipe/coloring/green_importer.json | 0 .../coloring/green_network_receiver.json | 0 .../coloring/green_network_transmitter.json | 0 .../recipe/coloring/green_relay.json | 0 .../coloring/green_security_manager.json | 0 .../coloring/green_wireless_transmitter.json | 0 .../recipe/coloring/light_blue_cable.json | 0 .../coloring/light_blue_constructor.json | 0 .../coloring/light_blue_controller.json | 0 .../coloring/light_blue_crafting_grid.json | 0 .../coloring/light_blue_destructor.json | 0 .../recipe/coloring/light_blue_detector.json | 0 .../coloring/light_blue_disk_interface.json | 0 .../recipe/coloring/light_blue_exporter.json | 0 .../coloring/light_blue_external_storage.json | 0 .../recipe/coloring/light_blue_grid.json | 0 .../recipe/coloring/light_blue_importer.json | 0 .../coloring/light_blue_network_receiver.json | 0 .../light_blue_network_transmitter.json | 0 .../recipe/coloring/light_blue_relay.json | 0 .../coloring/light_blue_security_manager.json | 0 .../light_blue_wireless_transmitter.json | 0 .../recipe/coloring/light_gray_cable.json | 0 .../coloring/light_gray_constructor.json | 0 .../coloring/light_gray_controller.json | 0 .../coloring/light_gray_crafting_grid.json | 0 .../coloring/light_gray_destructor.json | 0 .../recipe/coloring/light_gray_detector.json | 0 .../coloring/light_gray_disk_interface.json | 0 .../recipe/coloring/light_gray_exporter.json | 0 .../coloring/light_gray_external_storage.json | 0 .../recipe/coloring/light_gray_grid.json | 0 .../recipe/coloring/light_gray_importer.json | 0 .../coloring/light_gray_network_receiver.json | 0 .../light_gray_network_transmitter.json | 0 .../recipe/coloring/light_gray_relay.json | 0 .../coloring/light_gray_security_manager.json | 0 .../light_gray_wireless_transmitter.json | 0 .../recipe/coloring/lime_cable.json | 0 .../recipe/coloring/lime_constructor.json | 0 .../recipe/coloring/lime_controller.json | 0 .../recipe/coloring/lime_crafting_grid.json | 0 .../recipe/coloring/lime_destructor.json | 0 .../recipe/coloring/lime_detector.json | 0 .../recipe/coloring/lime_disk_interface.json | 0 .../recipe/coloring/lime_exporter.json | 0 .../coloring/lime_external_storage.json | 0 .../recipe/coloring/lime_grid.json | 0 .../recipe/coloring/lime_importer.json | 0 .../coloring/lime_network_receiver.json | 0 .../coloring/lime_network_transmitter.json | 0 .../recipe/coloring/lime_relay.json | 0 .../coloring/lime_security_manager.json | 0 .../coloring/lime_wireless_transmitter.json | 0 .../recipe/coloring/magenta_cable.json | 0 .../recipe/coloring/magenta_constructor.json | 0 .../recipe/coloring/magenta_controller.json | 0 .../coloring/magenta_crafting_grid.json | 0 .../recipe/coloring/magenta_destructor.json | 0 .../recipe/coloring/magenta_detector.json | 0 .../coloring/magenta_disk_interface.json | 0 .../recipe/coloring/magenta_exporter.json | 0 .../coloring/magenta_external_storage.json | 0 .../recipe/coloring/magenta_grid.json | 0 .../recipe/coloring/magenta_importer.json | 0 .../coloring/magenta_network_receiver.json | 0 .../coloring/magenta_network_transmitter.json | 0 .../recipe/coloring/magenta_relay.json | 0 .../coloring/magenta_security_manager.json | 0 .../magenta_wireless_transmitter.json | 0 .../recipe/coloring/orange_cable.json | 0 .../recipe/coloring/orange_constructor.json | 0 .../recipe/coloring/orange_controller.json | 0 .../recipe/coloring/orange_crafting_grid.json | 0 .../recipe/coloring/orange_destructor.json | 0 .../recipe/coloring/orange_detector.json | 0 .../coloring/orange_disk_interface.json | 0 .../recipe/coloring/orange_exporter.json | 0 .../coloring/orange_external_storage.json | 0 .../recipe/coloring/orange_grid.json | 0 .../recipe/coloring/orange_importer.json | 0 .../coloring/orange_network_receiver.json | 0 .../coloring/orange_network_transmitter.json | 0 .../recipe/coloring/orange_relay.json | 0 .../coloring/orange_security_manager.json | 0 .../coloring/orange_wireless_transmitter.json | 0 .../recipe/coloring/pink_cable.json | 0 .../recipe/coloring/pink_constructor.json | 0 .../recipe/coloring/pink_controller.json | 0 .../recipe/coloring/pink_crafting_grid.json | 0 .../recipe/coloring/pink_destructor.json | 0 .../recipe/coloring/pink_detector.json | 0 .../recipe/coloring/pink_disk_interface.json | 0 .../recipe/coloring/pink_exporter.json | 0 .../coloring/pink_external_storage.json | 0 .../recipe/coloring/pink_grid.json | 0 .../recipe/coloring/pink_importer.json | 0 .../coloring/pink_network_receiver.json | 0 .../coloring/pink_network_transmitter.json | 0 .../recipe/coloring/pink_relay.json | 0 .../coloring/pink_security_manager.json | 0 .../coloring/pink_wireless_transmitter.json | 0 .../recipe/coloring/purple_cable.json | 0 .../recipe/coloring/purple_constructor.json | 0 .../recipe/coloring/purple_controller.json | 0 .../recipe/coloring/purple_crafting_grid.json | 0 .../recipe/coloring/purple_destructor.json | 0 .../recipe/coloring/purple_detector.json | 0 .../coloring/purple_disk_interface.json | 0 .../recipe/coloring/purple_exporter.json | 0 .../coloring/purple_external_storage.json | 0 .../recipe/coloring/purple_grid.json | 0 .../recipe/coloring/purple_importer.json | 0 .../coloring/purple_network_receiver.json | 0 .../coloring/purple_network_transmitter.json | 0 .../recipe/coloring/purple_relay.json | 0 .../coloring/purple_security_manager.json | 0 .../coloring/purple_wireless_transmitter.json | 0 .../recipe/coloring/red_cable.json | 0 .../recipe/coloring/red_constructor.json | 0 .../recipe/coloring/red_controller.json | 0 .../recipe/coloring/red_crafting_grid.json | 0 .../recipe/coloring/red_destructor.json | 0 .../recipe/coloring/red_detector.json | 0 .../recipe/coloring/red_disk_interface.json | 0 .../recipe/coloring/red_exporter.json | 0 .../recipe/coloring/red_external_storage.json | 0 .../recipe/coloring/red_grid.json | 0 .../recipe/coloring/red_importer.json | 0 .../recipe/coloring/red_network_receiver.json | 0 .../coloring/red_network_transmitter.json | 0 .../recipe/coloring/red_relay.json | 0 .../recipe/coloring/red_security_manager.json | 0 .../coloring/red_wireless_transmitter.json | 0 .../recipe/coloring/white_cable.json | 0 .../recipe/coloring/white_constructor.json | 0 .../recipe/coloring/white_controller.json | 0 .../recipe/coloring/white_crafting_grid.json | 0 .../recipe/coloring/white_destructor.json | 0 .../recipe/coloring/white_detector.json | 0 .../recipe/coloring/white_disk_interface.json | 0 .../recipe/coloring/white_exporter.json | 0 .../coloring/white_external_storage.json | 0 .../recipe/coloring/white_grid.json | 0 .../recipe/coloring/white_importer.json | 0 .../coloring/white_network_receiver.json | 0 .../coloring/white_network_transmitter.json | 0 .../recipe/coloring/white_relay.json | 0 .../coloring/white_security_manager.json | 0 .../coloring/white_wireless_transmitter.json | 0 .../recipe/coloring/yellow_cable.json | 0 .../recipe/coloring/yellow_constructor.json | 0 .../recipe/coloring/yellow_controller.json | 0 .../recipe/coloring/yellow_crafting_grid.json | 0 .../recipe/coloring/yellow_destructor.json | 0 .../recipe/coloring/yellow_detector.json | 0 .../coloring/yellow_disk_interface.json | 0 .../recipe/coloring/yellow_exporter.json | 0 .../coloring/yellow_external_storage.json | 0 .../recipe/coloring/yellow_grid.json | 0 .../recipe/coloring/yellow_importer.json | 0 .../coloring/yellow_network_receiver.json | 0 .../coloring/yellow_network_transmitter.json | 0 .../recipe/coloring/yellow_relay.json | 0 .../coloring/yellow_security_manager.json | 0 .../coloring/yellow_wireless_transmitter.json | 0 .../data/refinedstorage/tags/item/cables.json | 0 .../tags/item/constructors.json | 0 .../refinedstorage/tags/item/controllers.json | 0 .../tags/item/crafting_grids.json | 0 .../tags/item/creative_controllers.json | 0 .../refinedstorage/tags/item/destructors.json | 0 .../refinedstorage/tags/item/detectors.json | 0 .../tags/item/disk_interfaces.json | 0 .../refinedstorage/tags/item/exporters.json | 0 .../tags/item/external_storages.json | 0 .../tags/item/fluid_storage_disks.json | 0 .../data/refinedstorage/tags/item/grids.json | 0 .../refinedstorage/tags/item/importers.json | 0 .../tags/item/network_receivers.json | 0 .../tags/item/network_transmitters.json | 0 .../data/refinedstorage/tags/item/relays.json | 0 .../tags/item/security_managers.json | 0 .../tags/item/storage_disks.json | 0 .../tags/item/wireless_transmitters.json | 0 .../common/AbstractClientModInitializer.java | 81 ++- .../common/AbstractModInitializer.java | 484 ++++++------- .../common/AbstractPlatform.java | 8 +- .../refinedstorage}/common/Config.java | 8 +- .../refinedstorage}/common/Platform.java | 16 +- .../common/PlatformApiImpl.java | 150 ++-- .../refinedstorage}/common/PlatformProxy.java | 18 +- .../ConfigurationCardItem.java | 10 +- ...ConfigurationCardItemPropertyFunction.java | 4 +- .../ConfigurationCardState.java | 2 +- .../configurationcard}/package-info.java | 2 +- .../AbstractConstructorDestructorBlock.java | 12 +- .../AbstractItemConstructorStrategy.java | 6 +- .../BlockBreakDestructorStrategy.java | 8 +- .../BlockBreakDestructorStrategyFactory.java | 12 +- .../CompositeConstructorStrategy.java | 4 +- .../CompositeDestructorStrategy.java | 4 +- .../ConstructorBlock.java | 18 +- .../ConstructorBlockEntity.java | 20 +- .../ConstructorContainerMenu.java | 20 +- .../ConstructorDestructorPropertyTypes.java | 8 +- .../ConstructorDropItemsSideButtonWidget.java | 8 +- .../ConstructorScreen.java | 10 +- .../DestructorBlock.java | 21 +- .../DestructorBlockEntity.java | 28 +- .../DestructorContainerMenu.java | 24 +- ...DestructorPickupItemsSideButtonWidget.java | 8 +- .../DestructorScreen.java | 10 +- .../FluidBreakDestructorStrategy.java | 8 +- .../FluidBreakDestructorStrategyFactory.java | 8 +- .../ItemDropConstructorStrategy.java | 2 +- .../ItemDropConstructorStrategyFactory.java | 10 +- .../ItemPickupDestructorStrategy.java | 6 +- .../ItemPickupDestructorStrategyFactory.java | 8 +- .../PlaceBlockConstructorStrategy.java | 4 +- .../PlaceFireworksConstructorStrategy.java | 2 +- .../PlaceFluidConstructorStrategy.java | 8 +- .../constructordestructor/package-info.java | 7 + .../common/content/BlockColorMap.java | 4 +- .../common/content/BlockConstants.java | 2 +- .../common/content/BlockEntities.java | 50 +- .../content/BlockEntityTypeFactory.java | 2 +- .../common/content/BlockFactory.java | 2 +- .../common/content/Blocks.java | 68 +- .../common/content/ColorMap.java | 2 +- .../common/content/ContentIds.java | 10 +- .../common/content/ContentNames.java | 8 +- .../common/content/CreativeModeTabItems.java | 8 +- .../common/content/DataComponents.java | 10 +- .../common/content/DefaultEnergyUsage.java | 2 +- .../content/DirectRegistryCallback.java | 2 +- .../content/ExtendedMenuTypeFactory.java | 2 +- .../refinedstorage}/common/content/Items.java | 26 +- .../common/content/KeyMappings.java | 2 +- .../common/content/LootFunctions.java | 8 +- .../common/content/MenuTypeFactory.java | 2 +- .../refinedstorage}/common/content/Menus.java | 54 +- .../common/content/RegistryCallback.java | 2 +- .../common/content/Sounds.java | 2 +- .../refinedstorage}/common/content/Tags.java | 4 +- .../common/content}/package-info.java | 2 +- .../controller/AbstractControllerBlock.java | 10 +- .../common/controller/ControllerBlock.java | 6 +- .../controller/ControllerBlockEntity.java | 20 +- .../ControllerBlockEntityTicker.java | 4 +- .../controller/ControllerBlockItem.java | 14 +- .../controller/ControllerContainerMenu.java | 18 +- .../common/controller/ControllerData.java | 2 +- .../controller/ControllerEnergyType.java | 2 +- .../ControllerItemPropertyFunction.java | 4 +- .../common/controller/ControllerScreen.java | 14 +- .../common/controller/ControllerType.java | 6 + .../controller/CreativeControllerBlock.java | 6 +- .../CreativeControllerBlockItem.java | 6 +- .../common/controller}/package-info.java | 2 +- .../common/detector/DetectorBlock.java | 32 +- .../common/detector/DetectorBlockEntity.java | 28 +- .../detector/DetectorContainerMenu.java | 18 +- .../common/detector/DetectorModeSettings.java | 2 +- .../DetectorModeSideButtonWidget.java | 8 +- .../detector/DetectorPropertyTypes.java | 6 +- .../common/detector/DetectorScreen.java | 8 +- .../detector/FuzzyDetectorAmountStrategy.java | 4 +- .../common/detector/package-info.java | 7 + .../common/exporter/ExporterBlock.java | 26 +- .../common/exporter/ExporterBlockEntity.java | 22 +- .../exporter/ExporterContainerMenu.java | 16 +- .../common/exporter/ExporterScreen.java | 10 +- .../FuzzyExporterTransferStrategy.java | 4 +- .../common/exporter/package-info.java | 7 + .../common/grid/AbstractGridBlock.java | 14 +- .../common/grid/AbstractGridBlockEntity.java | 20 +- .../grid/AbstractGridContainerMenu.java | 46 +- .../common/grid/AbstractGridSynchronizer.java | 6 +- .../common/grid/ClientCraftingGridSource.java | 6 +- .../common/grid/CraftingGridBlock.java | 20 +- .../common/grid/CraftingGridBlockEntity.java | 16 +- .../grid/CraftingGridContainerMenu.java | 16 +- .../grid/CraftingGridMatrixCloseBehavior.java | 2 +- .../grid/CraftingGridRefillContext.java | 4 +- .../grid/CraftingGridRefillContextImpl.java | 4 +- .../common/grid/CraftingGridResultSlot.java | 6 +- .../common/grid/CraftingGridSource.java | 4 +- .../common/grid/CraftingGridSourceImpl.java | 4 +- .../common/grid/CraftingMatrix.java | 2 +- .../grid/CraftingMatrixContainerMenu.java | 2 +- .../common/grid/GridBlock.java | 20 +- .../common/grid/GridBlockEntity.java | 8 +- .../common/grid/GridContainerMenu.java | 12 +- .../refinedstorage}/common/grid/GridData.java | 10 +- .../common/grid/GridSearchBox.java | 2 +- .../common/grid/GridSortingTypes.java | 4 +- .../common/grid/NoopGridSynchronizer.java | 4 +- .../common/grid/PortableGridData.java | 6 +- .../common/grid/SecuredGridOperations.java | 10 +- .../SnapshotCraftingGridRefillContext.java | 6 +- .../common/grid/WirelessGrid.java | 14 +- .../grid/WirelessGridContainerMenu.java | 8 +- .../common/grid/WirelessGridData.java | 6 +- .../WirelessGridExtendedMenuProvider.java | 10 +- .../common/grid/WirelessGridItem.java | 20 +- .../common/grid/WirelessGridOperations.java | 6 +- .../common/grid/package-info.java | 7 + .../grid/screen/AbstractGridScreen.java | 46 +- .../screen/AutoSelectedSideButtonWidget.java | 12 +- .../grid/screen/CraftingGridScreen.java | 16 +- .../common/grid/screen/GridScreen.java | 6 +- .../grid/screen/GridSearchBoxWidget.java | 8 +- .../common/grid/screen/LastModified.java | 2 +- .../screen/ResourceTypeSideButtonWidget.java | 12 +- .../SortingDirectionSideButtonWidget.java | 8 +- .../screen/SortingTypeSideButtonWidget.java | 10 +- .../SynchronizationSideButtonWidget.java | 8 +- .../screen/hint/FluidGridInsertionHint.java | 14 +- .../screen/hint/GridInsertionHintsImpl.java | 6 +- .../screen/hint/ItemGridInsertionHint.java | 8 +- .../hint/SingleItemGridInsertionHint.java | 6 +- .../common/grid/screen/hint/package-info.java | 7 + .../common/grid/screen/package-info.java | 7 + .../ClientGridExtractionStrategy.java | 8 +- .../strategy/ClientGridInsertionStrategy.java | 6 +- .../strategy/ClientGridScrollingStrategy.java | 14 + .../CompositeGridExtractionStrategy.java | 6 +- .../CompositeGridInsertionStrategy.java | 4 +- .../CompositeGridScrollingStrategy.java | 8 +- .../common/grid/strategy}/package-info.java | 2 +- .../AbstractFluidGridResourceFactory.java | 4 +- .../view/AbstractItemGridResourceFactory.java | 4 +- .../view/CompositeGridResourceFactory.java | 6 +- .../common/grid/view/FluidGridResource.java | 22 +- .../common/grid/view/ItemGridResource.java | 20 +- .../common/grid/view/package-info.java | 7 + .../iface/ExportedResourcesContainer.java | 12 +- .../common/iface/InterfaceBlock.java | 16 +- .../common/iface/InterfaceBlockEntity.java | 26 +- .../common/iface/InterfaceContainerMenu.java | 24 +- .../common/iface/InterfaceData.java | 4 +- ...latformExternalStorageProviderFactory.java | 4 +- ...InterfaceProxyExternalStorageProvider.java | 2 +- .../common/iface/InterfaceScreen.java | 12 +- .../common/iface/package-info.java | 7 + .../common/importer/ImporterBlock.java | 26 +- .../common/importer/ImporterBlockEntity.java | 32 +- .../importer/ImporterContainerMenu.java | 24 +- .../common/importer/ImporterScreen.java | 12 +- .../common/importer/package-info.java | 7 + .../common/misc/ProcessorItem.java | 2 +- .../common/misc/WrenchItem.java | 6 +- .../common/misc/package-info.java | 7 + .../common/networking/CableBlock.java | 32 +- .../networking/NetworkCardInventory.java | 4 +- .../common/networking/NetworkCardItem.java | 13 +- .../NetworkCardItemPropertyFunction.java | 4 +- .../networking/NetworkReceiverBlock.java | 22 +- .../NetworkReceiverBlockEntity.java | 12 +- .../common/networking/NetworkReceiverKey.java | 2 +- .../networking/NetworkTransmitterBlock.java | 18 +- .../NetworkTransmitterBlockEntity.java | 20 +- .../NetworkTransmitterBlockEntityTicker.java | 6 +- .../NetworkTransmitterContainerMenu.java | 18 +- .../networking/NetworkTransmitterData.java | 2 +- .../networking/NetworkTransmitterScreen.java | 12 +- .../networking/NetworkTransmitterState.java | 2 +- .../common/networking/RelayBlock.java | 26 +- .../common/networking/RelayBlockEntity.java | 26 +- .../common/networking/RelayContainerMenu.java | 22 +- .../RelayInputNetworkNodeContainer.java | 6 +- .../RelayOutputNetworkNodeContainer.java | 6 +- .../RelayPassEnergySideButtonWidget.java | 8 +- .../RelayPassSecuritySideButtonWidget.java | 8 +- .../RelayPassStorageSideButtonWidget.java | 8 +- .../RelayPassThroughSideButtonWidget.java | 8 +- .../common/networking/RelayPropertyTypes.java | 8 +- .../common/networking/RelayScreen.java | 20 +- .../common/networking/package-info.java | 7 + .../refinedstorage/common/package-info.java | 7 + .../AbstractSecurityCardContainerMenu.java | 12 +- ...tractSecurityCardExtendedMenuProvider.java | 8 +- .../security/AbstractSecurityCardItem.java | 16 +- .../security/AbstractSecurityCardScreen.java | 12 +- .../common/security/BuiltinPermission.java | 12 +- .../FallbackSecurityCardContainerMenu.java | 6 +- ...lbackSecurityCardExtendedMenuProvider.java | 8 +- .../security/FallbackSecurityCardItem.java | 12 +- .../security/FallbackSecurityCardScreen.java | 2 +- .../PlatformSecurityNetworkComponentImpl.java | 4 +- .../security/PlayerBoundSecurityCardData.java | 2 +- .../common/security/PlayerSecurityActor.java | 2 +- .../security/SecurityCardBoundPlayer.java | 2 +- .../security/SecurityCardContainerMenu.java | 10 +- .../common/security/SecurityCardData.java | 10 +- .../SecurityCardExtendedMenuProvider.java | 8 +- .../common/security/SecurityCardItem.java | 14 +- .../SecurityCardItemPropertyFunction.java | 4 +- .../security/SecurityCardPermissions.java | 6 +- .../common/security/SecurityCardScreen.java | 2 +- .../common/security/SecurityManagerBlock.java | 30 +- .../security/SecurityManagerBlockEntity.java | 24 +- .../SecurityManagerContainerMenu.java | 25 +- .../security/SecurityManagerScreen.java | 16 +- .../common/security/package-info.java | 7 + .../AbstractDiskContainerBlockEntity.java | 22 +- .../AbstractProgressStorageScreen.java | 4 +- .../storage/AbstractStorageContainerMenu.java | 12 +- .../common/storage/AbstractStorageScreen.java | 14 +- .../common/storage/AccessModeSettings.java | 2 +- .../storage/AccessModeSideButtonWidget.java | 8 +- ...ucketPlayerInventoryInsertableStorage.java | 8 +- .../storage/ClientStorageRepository.java | 8 +- .../refinedstorage}/common/storage/Disk.java | 2 +- .../DiskContainerBlockEntityTicker.java | 4 +- .../common/storage/DiskInventory.java | 8 +- .../storage/DiskStateChangeListener.java | 2 +- .../storage/FilterModeSideButtonWidget.java | 8 +- .../common/storage/FluidStorageVariant.java | 4 +- .../common/storage/ItemStorageVariant.java | 2 +- .../storage/LimitedPlatformStorage.java | 4 +- .../common/storage/PlatformStorage.java | 8 +- .../storage/PrioritySideButtonWidget.java | 10 +- .../common/storage/SameTypeStorageType.java | 6 +- .../common/storage/StorageAccessor.java | 2 +- .../common/storage/StorageCodecs.java | 4 +- .../StorageConfigurationContainer.java | 4 +- .../StorageConfigurationContainerImpl.java | 8 +- .../StorageContainerItemHelperImpl.java | 18 +- .../common/storage/StoragePropertyTypes.java | 8 +- .../common/storage/StorageRepositoryImpl.java | 10 +- .../common/storage/StorageTooltipHelper.java | 4 +- .../common/storage/StorageTypes.java | 12 +- .../storage/VoidExcessSideButtonWidget.java | 8 +- .../AbstractDiskDriveBlockEntity.java | 12 +- .../AbstractDiskDriveBlockEntityRenderer.java | 8 +- .../storage/diskdrive/DiskDriveBlock.java | 20 +- .../diskdrive/DiskDriveContainerMenu.java | 34 +- .../storage/diskdrive/DiskDriveScreen.java | 8 +- .../EmptyStorageDiskInfoAccessor.java | 4 +- .../diskdrive/StorageDiskInfoAccessor.java | 4 +- .../StorageDiskInfoAccessorImpl.java | 8 +- .../storage/diskdrive}/package-info.java | 2 +- .../AbstractDiskInterfaceBlockEntity.java | 24 +- ...tractDiskInterfaceBlockEntityRenderer.java | 8 +- .../diskinterface/DiskInterfaceBlock.java | 28 +- .../DiskInterfaceContainerMenu.java | 42 +- .../DiskInterfacePropertyTypes.java | 6 +- .../diskinterface/DiskInterfaceScreen.java | 16 +- .../diskinterface/TransferModeSettings.java | 2 +- .../TransferModeSideButtonWidget.java | 8 +- .../storage/diskinterface/package-info.java | 7 + .../externalstorage/ExternalStorageBlock.java | 26 +- .../ExternalStorageBlockEntity.java | 24 +- .../ExternalStorageContainerMenu.java | 20 +- .../ExternalStorageScreen.java | 6 +- ...ternalStorageTrackedStorageRepository.java | 8 +- .../ExternalStorageWorkRate.java | 2 +- .../storage/externalstorage/package-info.java | 7 + .../common/storage/package-info.java | 7 + .../AbstractPortableGridBlockEntity.java | 42 +- ...stractPortableGridBlockEntityRenderer.java | 8 +- .../AbstractPortableGridContainerMenu.java | 20 +- .../portablegrid/InWorldPortableGrid.java | 4 +- .../storage/portablegrid/PortableGrid.java | 12 +- .../portablegrid/PortableGridBlock.java | 14 +- .../PortableGridBlockContainerMenu.java | 14 +- .../PortableGridBlockEntityTicker.java | 4 +- .../portablegrid/PortableGridBlockItem.java | 28 +- .../PortableGridBlockItemRenderInfo.java | 6 + .../PortableGridItemContainerMenu.java | 12 +- .../PortableGridItemExtendedMenuProvider.java | 16 +- .../PortableGridLootItemFunction.java | 6 +- .../portablegrid/PortableGridOperations.java | 4 +- .../portablegrid/PortableGridScreen.java | 8 +- .../portablegrid/PortableGridStorage.java | 2 +- .../portablegrid/PortableGridType.java | 6 + .../storage/portablegrid/package-info.java | 7 + .../storageblock/AbstractStorageBlock.java | 6 +- .../AbstractStorageBlockBlockEntity.java | 26 +- .../AbstractStorageBlockContainerMenu.java | 20 +- .../AbstractStorageBlockScreen.java | 6 +- .../storageblock/FluidStorageBlock.java | 10 +- .../FluidStorageBlockBlockEntity.java | 16 +- .../FluidStorageBlockBlockItem.java | 20 +- .../FluidStorageBlockContainerMenu.java | 10 +- .../storageblock/FluidStorageBlockScreen.java | 4 +- .../storageblock/ItemStorageBlock.java | 10 +- .../ItemStorageBlockBlockEntity.java | 16 +- .../ItemStorageBlockBlockItem.java | 18 +- .../ItemStorageBlockContainerMenu.java | 10 +- .../storageblock/ItemStorageBlockScreen.java | 2 +- .../storageblock/StorageBlockData.java | 4 +- .../StorageBlockLootItemFunction.java | 8 +- .../storage/storageblock/package-info.java | 7 + .../storagedisk/FluidStorageDiskItem.java | 24 +- .../storagedisk/ItemStorageDiskItem.java | 22 +- .../storage/storagedisk/package-info.java | 7 + ...ositeStorageMonitorExtractionStrategy.java | 4 +- ...positeStorageMonitorInsertionStrategy.java | 4 +- ...FluidStorageMonitorExtractionStrategy.java | 10 +- .../FluidStorageMonitorInsertionStrategy.java | 10 +- .../ItemStorageMonitorExtractionStrategy.java | 6 +- .../ItemStorageMonitorInsertionStrategy.java | 6 +- .../storagemonitor/StorageMonitorBlock.java | 22 +- .../StorageMonitorBlockEntity.java | 30 +- .../StorageMonitorBlockEntityRenderer.java | 10 +- .../StorageMonitorContainerMenu.java | 26 +- .../StorageMonitorInsertTracker.java | 4 +- .../storagemonitor/StorageMonitorScreen.java | 12 +- .../common/storagemonitor}/package-info.java | 2 +- ...AbstractActiveColoredDirectionalBlock.java | 2 +- .../common/support/AbstractBaseBlock.java | 16 +- .../support/AbstractBaseContainerMenu.java | 20 +- .../common/support/AbstractBaseScreen.java | 34 +- .../support/AbstractBlockEntityTicker.java | 2 +- .../common/support/AbstractColoredBlock.java | 2 +- .../support/AbstractDirectionalBlock.java | 4 +- .../AbstractDirectionalCableBlock.java | 8 +- .../common/support/AbstractFilterScreen.java | 8 +- .../support/AbstractPlatformSavedData.java | 4 +- .../common/support/BaseBlockItem.java | 4 +- .../common/support/BlockEntityWithDrops.java | 2 +- .../common/support/BlockItemProvider.java | 2 +- .../common/support/CableBlockSupport.java | 4 +- .../common/support/CableShapeCacheKey.java | 16 + .../common/support/ColorableBlock.java | 4 +- .../support/DirectionalCableBlockShapes.java | 2 +- .../common/support/FilterModeSettings.java | 2 +- .../common/support/FilterWithFuzzyMode.java | 6 +- .../common/support/FilteredContainer.java | 2 +- .../common/support/NetworkNodeBlockItem.java | 4 +- .../support/PlayerAwareBlockEntity.java | 2 +- .../common/support/RedstoneMode.java | 2 +- .../common/support/RedstoneModeSettings.java | 2 +- .../common/support/SchedulingMode.java | 2 +- .../common/support/SchedulingModeType.java | 4 +- .../common/support/SimpleBlock.java | 4 +- .../common/support/SimpleItem.java | 2 +- .../common/support/TextureIds.java | 4 +- .../support/amount/AbstractAmountScreen.java | 6 +- .../amount/AbstractSingleAmountScreen.java | 6 +- .../support/amount/AmountOperations.java | 2 +- .../amount/AmountScreenConfiguration.java | 2 +- .../amount/DoubleAmountOperations.java | 2 +- .../amount/IntegerAmountOperations.java | 2 +- .../support/amount/LongAmountOperations.java | 4 +- .../common/support/amount/PriorityScreen.java | 8 +- .../support/amount/ResourceAmountScreen.java | 10 +- .../common/support/amount}/package-info.java | 2 +- .../AbstractResourceContainerMenu.java | 8 +- .../AbstractSchedulingContainerMenu.java | 16 +- .../AbstractSimpleFilterContainerMenu.java | 16 +- .../AbstractSingleAmountContainerMenu.java | 10 +- .../support/containermenu/ClientProperty.java | 4 +- .../support/containermenu/DisabledSlot.java | 2 +- .../containermenu/ExtendedMenuProvider.java | 2 +- .../support/containermenu/MenuOpener.java | 2 +- .../NetworkNodeExtendedMenuProvider.java | 2 +- .../NetworkNodeMenuProvider.java | 8 +- .../support/containermenu/Property.java | 2 +- .../support/containermenu/PropertyType.java | 2 +- .../support/containermenu/PropertyTypes.java | 12 +- .../ResourceInventoryDestination.java | 2 +- .../support/containermenu/ResourceSlot.java | 14 +- .../containermenu/ResourceSlotType.java | 2 +- .../support/containermenu/ServerProperty.java | 2 +- .../containermenu/SingleAmountData.java | 8 +- .../containermenu/TransferDestination.java | 2 +- .../containermenu/TransferManager.java | 2 +- .../support/containermenu/ValidatedSlot.java | 4 +- .../support/containermenu/package-info.java | 7 + .../common/support/direction/BiDirection.java | 2 +- .../support/direction/BiDirectionType.java | 2 +- .../direction/DefaultDirectionType.java | 2 +- .../support/direction/DirectionType.java | 2 +- .../direction/HorizontalDirection.java | 2 +- .../direction/HorizontalDirectionType.java | 2 +- .../support/direction}/package-info.java | 2 +- .../energy/BlockEntityEnergyStorage.java | 2 +- .../support/energy/CreativeEnergyStorage.java | 2 +- .../support/energy/EnergyContainerMenu.java | 2 +- .../common/support/energy/EnergyInfo.java | 6 +- .../support/energy/EnergyItemHelperImpl.java | 10 +- .../energy/EnergyLootItemFunction.java | 8 +- .../energy/ItemBlockEnergyStorage.java | 2 +- .../support/energy/ItemEnergyStorage.java | 4 +- .../common/support/energy/package-info.java | 7 + ...actingNetworkNodeContainerBlockEntity.java | 2 +- ...neModeNetworkNodeContainerBlockEntity.java | 12 +- ...dulingNetworkNodeContainerBlockEntity.java | 16 +- ...deableNetworkNodeContainerBlockEntity.java | 14 +- .../BaseNetworkNodeContainerBlockEntity.java | 14 +- .../network/ConnectionProviderImpl.java | 6 +- .../support/network/ConnectionSinkImpl.java | 4 +- .../InWorldNetworkNodeContainerImpl.java | 8 +- .../network/NetworkNodeBlockEntityTicker.java | 4 +- .../bounditem/NetworkBoundItemHelperImpl.java | 16 +- .../NetworkBoundItemItemPropertyFunction.java | 6 +- .../NetworkBoundItemSessionImpl.java | 12 +- .../network/bounditem/package-info.java | 7 + .../PlatformStorageNetworkComponent.java | 8 +- .../network/component/package-info.java | 7 + .../common/support/network}/package-info.java | 2 +- .../common/support/package-info.java | 7 + .../common/support/packet/PacketContext.java | 2 +- .../common/support/packet/PacketHandler.java | 2 +- .../common/support/packet/c2s/C2SPackets.java | 16 +- .../packet/c2s/CraftingGridClearPacket.java | 8 +- .../c2s/CraftingGridRecipeTransferPacket.java | 12 +- .../support/packet/c2s/GridExtractPacket.java | 14 +- .../support/packet/c2s/GridInsertPacket.java | 10 +- .../support/packet/c2s/GridScrollPacket.java | 16 +- .../packet/c2s/PropertyChangePacket.java | 8 +- .../c2s/ResourceFilterSlotChangePacket.java | 12 +- .../c2s/ResourceSlotAmountChangePacket.java | 8 +- .../packet/c2s/ResourceSlotChangePacket.java | 8 +- .../c2s/SecurityCardBoundPlayerPacket.java | 8 +- .../c2s/SecurityCardPermissionPacket.java | 12 +- .../SecurityCardResetPermissionPacket.java | 12 +- .../packet/c2s/SingleAmountChangePacket.java | 8 +- .../packet/c2s/StorageInfoRequestPacket.java | 12 +- .../c2s/UseSlotReferencedItemPacket.java | 12 +- .../support/packet/c2s}/package-info.java | 2 +- .../common/support/packet/package-info.java | 7 + .../support/packet/s2c/EnergyInfoPacket.java | 8 +- .../support/packet/s2c/GridActivePacket.java | 6 +- .../support/packet/s2c/GridClearPacket.java | 8 +- .../support/packet/s2c/GridUpdatePacket.java | 14 +- .../s2c/NetworkTransmitterStatusPacket.java | 10 +- .../packet/s2c/NoPermissionPacket.java | 6 +- .../packet/s2c/ResourceSlotUpdatePacket.java | 10 +- .../common/support/packet/s2c/S2CPackets.java | 10 +- .../packet/s2c/StorageInfoResponsePacket.java | 8 +- .../s2c/WirelessTransmitterRangePacket.java | 8 +- .../support/packet/s2c}/package-info.java | 2 +- .../registry/PlatformRegistryImpl.java | 4 +- .../common/support/registry/package-info.java | 7 + .../AbstractDiskLedBlockEntityRenderer.java | 6 +- .../support/render/AbstractFluidRenderer.java | 2 +- .../common/support/render/CubeBuilder.java | 2 +- .../common/support/render/FluidRenderer.java | 4 +- .../common/support/render/package-info.java | 7 + ...ractResourceContainerContainerAdapter.java | 4 +- ...CompositeRecipeModIngredientConverter.java | 6 +- .../support/resource/FluidResource.java | 8 +- .../FluidResourceContainerInsertStrategy.java | 6 +- .../resource/FluidResourceFactory.java | 6 +- .../resource/FluidResourceRendering.java | 8 +- .../support/resource/FluidResourceType.java | 14 +- .../common/support/resource/ItemResource.java | 8 +- .../support/resource/ItemResourceFactory.java | 4 +- .../resource/ItemResourceRendering.java | 6 +- .../support/resource/ItemResourceType.java | 14 +- .../support/resource/ResourceCodecs.java | 8 +- .../resource/ResourceContainerData.java | 4 +- .../resource/ResourceContainerImpl.java | 12 +- .../resource/ResourceContainerSlot.java | 4 +- .../support/resource/ResourceTypes.java | 4 +- .../resource/list/FuzzyResourceListImpl.java | 6 +- .../support/resource/list/package-info.java | 7 + .../common/support/resource/package-info.java | 7 + .../CompositeSlotReferenceProvider.java | 8 +- .../slotreference/InventorySlotReference.java | 6 +- .../InventorySlotReferenceFactory.java | 6 +- .../InventorySlotReferenceProvider.java | 6 +- .../support/slotreference/package-info.java | 7 + .../stretching/AbstractStretchingScreen.java | 10 +- .../common/support/stretching/ScreenSize.java | 2 +- .../stretching/ScreenSizeListener.java | 2 +- .../ScreenSizeSideButtonWidget.java | 8 +- .../support/stretching/package-info.java | 7 + .../CompositeClientTooltipComponent.java | 2 +- .../tooltip/HelpClientTooltipComponent.java | 6 +- .../tooltip/MouseClientTooltipComponent.java | 10 +- .../ResourceClientTooltipComponent.java | 6 +- .../common/support/tooltip/SmallText.java | 2 +- .../SmallTextClientTooltipComponent.java | 2 +- .../common/support/tooltip/package-info.java | 7 + .../widget/AbstractSideButtonWidget.java | 10 +- .../widget/AbstractYesNoSideButtonWidget.java | 8 +- .../support/widget/CustomCheckboxWidget.java | 2 +- .../widget/FuzzyModeSideButtonWidget.java | 6 +- .../common/support/widget/History.java | 2 +- .../support/widget/HoveredImageButton.java | 2 +- .../common/support/widget/ProgressWidget.java | 4 +- .../widget/RedstoneModeSideButtonWidget.java | 8 +- .../SchedulingModeSideButtonWidget.java | 8 +- .../support/widget/ScrollbarWidget.java | 6 +- .../support/widget/SearchFieldWidget.java | 6 +- .../common/support/widget/package-info.java | 7 + .../common/upgrade/FortuneUpgradeItem.java | 12 +- .../common/upgrade/RangeUpgradeItem.java | 12 +- .../RegulatorUpgradeContainerMenu.java | 14 +- .../common/upgrade/RegulatorUpgradeItem.java | 30 +- .../upgrade/RegulatorUpgradeScreen.java | 4 +- .../common/upgrade/RegulatorUpgradeState.java | 6 +- .../common/upgrade/SimpleUpgradeItem.java | 14 +- .../common/upgrade/UpgradeContainer.java | 12 +- ...radeDestinationClientTooltipComponent.java | 4 +- .../common/upgrade/UpgradeDestinations.java | 8 +- .../UpgradeItemClientTooltipComponent.java | 4 +- .../common/upgrade/UpgradeRegistryImpl.java | 8 +- .../common/upgrade/UpgradeSlot.java | 4 +- .../UpgradeWithEnchantedBookRecipe.java | 4 +- ...radeWithEnchantedBookRecipeSerializer.java | 2 +- .../common/upgrade/package-info.java | 7 + .../common/util/ContainerUtil.java | 2 +- .../common/util/CustomBlockPlaceContext.java | 2 +- .../common/util/IdentifierUtil.java | 4 +- .../refinedstorage}/common/util/MathUtil.java | 2 +- .../common/util/PacketUtil.java | 2 +- .../common/util/SecurityToastUtil.java | 4 +- .../common/util/ServerEventQueue.java | 2 +- .../common/util/package-info.java | 7 + .../BaseWirelessTransmitterRangeModifier.java | 12 + ...ositeWirelessTransmitterRangeModifier.java | 6 +- ...gradeWirelessTransmitterRangeModifier.java | 8 +- ...gradeWirelessTransmitterRangeModifier.java | 10 +- .../WirelessTransmitterBlock.java | 28 +- .../WirelessTransmitterBlockEntity.java | 28 +- .../WirelessTransmitterContainerMenu.java | 24 +- .../WirelessTransmitterData.java | 2 +- ...relessTransmitterNetworkNodeContainer.java | 8 +- .../WirelessTransmitterScreen.java | 12 +- .../wirelesstransmitter}/package-info.java | 2 +- .../1024b_fluid_storage_block.json | 0 .../blockstates/16k_storage_block.json | 0 .../blockstates/1k_storage_block.json | 0 .../blockstates/256b_fluid_storage_block.json | 0 .../4096b_fluid_storage_block.json | 0 .../blockstates/4k_storage_block.json | 0 .../blockstates/64b_fluid_storage_block.json | 0 .../blockstates/64k_storage_block.json | 0 .../creative_fluid_storage_block.json | 0 .../blockstates/creative_portable_grid.json | 0 .../blockstates/creative_storage_block.json | 0 .../blockstates/disk_drive.json | 0 .../refinedstorage/blockstates/interface.json | 0 .../blockstates/machine_casing.json | 0 .../blockstates/portable_grid.json | 0 .../quartz_enriched_copper_block.json | 0 .../quartz_enriched_iron_block.json | 0 .../blockstates/storage_monitor.json | 0 .../resources/assets/refinedstorage/icon.png | Bin .../assets/refinedstorage/lang/de_de.json | 0 .../assets/refinedstorage/lang/en_us.json | 0 .../assets/refinedstorage/lang/es_es.json | 0 .../assets/refinedstorage/lang/fr_fr.json | 0 .../assets/refinedstorage/lang/hu_hu.json | 0 .../assets/refinedstorage/lang/id_id.json | 0 .../assets/refinedstorage/lang/it_it.json | 0 .../assets/refinedstorage/lang/ja_jp.json | 0 .../assets/refinedstorage/lang/ko_kr.json | 0 .../assets/refinedstorage/lang/pl_pl.json | 0 .../assets/refinedstorage/lang/pt_br.json | 0 .../assets/refinedstorage/lang/ru_ru.json | 0 .../assets/refinedstorage/lang/tr_tr.json | 0 .../assets/refinedstorage/lang/zh_cn.json | 0 .../assets/refinedstorage/lang/zh_tw.json | 0 .../block/1024b_fluid_storage_block.json | 0 .../models/block/16k_storage_block.json | 0 .../models/block/1k_storage_block.json | 0 .../block/256b_fluid_storage_block.json | 0 .../block/4096b_fluid_storage_block.json | 0 .../models/block/4k_storage_block.json | 0 .../models/block/64b_fluid_storage_block.json | 0 .../models/block/64k_storage_block.json | 0 .../models/block/all_cutout.json | 0 .../models/block/cable/core/base.json | 0 .../models/block/cable/extension/base.json | 0 .../models/block/constructor/active.json | 0 .../models/block/constructor/inactive.json | 0 .../block/constructor_destructor/active.json | 0 .../constructor_destructor/inactive.json | 0 .../models/block/controller/nearly.json | 0 .../models/block/controller/nearly_off.json | 0 .../models/block/controller/nearly_on.json | 0 .../models/block/controller/off.json | 0 .../block/creative_fluid_storage_block.json | 0 .../models/block/creative_portable_grid.json | 0 .../models/block/creative_storage_block.json | 0 .../refinedstorage/models/block/cutout.json | 0 .../models/block/destructor/active.json | 0 .../models/block/destructor/inactive.json | 0 .../models/block/detector/powered.json | 0 .../models/block/detector/unpowered.json | 0 .../models/block/disk/disk.json | 0 .../models/block/disk/fluid_disk.json | 0 .../models/block/disk/led_full.json | 0 .../models/block/disk/led_inactive.json | 0 .../models/block/disk/led_near_capacity.json | 0 .../models/block/disk/led_normal.json | 0 .../models/block/disk_drive.json | 0 .../models/block/disk_drive/base.json | 0 .../models/block/emissive_all_cutout.json | 0 .../models/block/emissive_cutout.json | 0 .../models/block/emissive_north_cutout.json | 0 .../refinedstorage/models/block/exporter.json | 0 .../models/block/external_storage.json | 0 .../refinedstorage/models/block/importer.json | 0 .../models/block/interface_active.json | 0 .../models/block/interface_inactive.json | 0 .../models/block/machine_casing.json | 0 .../models/block/north_cutout.json | 0 .../models/block/portable_grid.json | 0 .../models/block/portable_grid/active.json | 0 .../models/block/portable_grid/base.json | 0 .../models/block/portable_grid/inactive.json | 0 .../block/quartz_enriched_copper_block.json | 0 .../block/quartz_enriched_iron_block.json | 0 .../models/block/storage_monitor.json | 0 .../block/wireless_transmitter/active.json | 0 .../block/wireless_transmitter/inactive.json | 0 .../item/1024b_fluid_storage_block.json | 0 .../models/item/1024b_fluid_storage_disk.json | 0 .../models/item/1024b_fluid_storage_part.json | 0 .../models/item/16k_storage_block.json | 0 .../models/item/16k_storage_disk.json | 0 .../models/item/16k_storage_part.json | 0 .../models/item/1k_storage_block.json | 0 .../models/item/1k_storage_disk.json | 0 .../models/item/1k_storage_part.json | 0 .../models/item/256b_fluid_storage_block.json | 0 .../models/item/256b_fluid_storage_disk.json | 0 .../models/item/256b_fluid_storage_part.json | 0 .../item/4096b_fluid_storage_block.json | 0 .../models/item/4096b_fluid_storage_disk.json | 0 .../models/item/4096b_fluid_storage_part.json | 0 .../models/item/4k_storage_block.json | 0 .../models/item/4k_storage_disk.json | 0 .../models/item/4k_storage_part.json | 0 .../models/item/64b_fluid_storage_block.json | 0 .../models/item/64b_fluid_storage_disk.json | 0 .../models/item/64b_fluid_storage_part.json | 0 .../models/item/64k_storage_block.json | 0 .../models/item/64k_storage_disk.json | 0 .../models/item/64k_storage_part.json | 0 .../models/item/advanced_processor.json | 0 .../models/item/basic_processor.json | 0 .../refinedstorage/models/item/book.json | 0 .../models/item/cable/base.json | 0 .../models/item/configuration_card.json | 0 .../item/configuration_card/active.json | 0 .../item/configuration_card/inactive.json | 0 .../models/item/construction_core.json | 0 .../models/item/constructor/base.json | 0 .../item/creative_fluid_storage_block.json | 0 .../item/creative_fluid_storage_disk.json | 0 .../models/item/creative_portable_grid.json | 0 .../models/item/creative_range_upgrade.json | 0 .../models/item/creative_storage_block.json | 0 .../models/item/creative_storage_disk.json | 0 .../models/item/creative_wireless_grid.json | 0 .../models/item/destruction_core.json | 0 .../models/item/destructor/base.json | 0 .../models/item/disk_drive.json | 0 .../models/item/exporter/base.json | 0 .../models/item/external_storage/base.json | 0 .../models/item/fallback_security_card.json | 0 .../models/item/fortune_1_upgrade.json | 0 .../models/item/fortune_2_upgrade.json | 0 .../models/item/fortune_3_upgrade.json | 0 .../models/item/importer/base.json | 0 .../models/item/improved_processor.json | 0 .../refinedstorage/models/item/interface.json | 0 .../models/item/machine_casing.json | 0 .../models/item/network_card.json | 0 .../models/item/network_card/active.json | 0 .../models/item/network_card/inactive.json | 0 .../models/item/portable_grid.json | 0 .../models/item/processor_binding.json | 0 .../models/item/quartz_enriched_copper.json | 0 .../item/quartz_enriched_copper_block.json | 0 .../models/item/quartz_enriched_iron.json | 0 .../item/quartz_enriched_iron_block.json | 0 .../models/item/range_upgrade.json | 0 .../models/item/raw_advanced_processor.json | 0 .../models/item/raw_basic_processor.json | 0 .../models/item/raw_improved_processor.json | 0 .../models/item/regulator_upgrade.json | 0 .../models/item/security_card.json | 0 .../models/item/security_card/active.json | 0 .../models/item/security_card/inactive.json | 0 .../refinedstorage/models/item/silicon.json | 0 .../models/item/silk_touch_upgrade.json | 0 .../models/item/speed_upgrade.json | 0 .../models/item/stack_upgrade.json | 0 .../models/item/storage_housing.json | 0 .../models/item/storage_monitor.json | 0 .../refinedstorage/models/item/upgrade.json | 0 .../models/item/wireless_grid.json | 0 .../models/item/wireless_grid/active.json | 0 .../models/item/wireless_grid/inactive.json | 0 .../refinedstorage/models/item/wrench.json | 0 .../assets/refinedstorage/sounds.json | 0 .../assets/refinedstorage/sounds/wrench.ogg | Bin .../refinedstorage/textures/block/bottom.png | Bin .../textures/block/cable/black.png | Bin .../textures/block/cable/blue.png | Bin .../textures/block/cable/brown.png | Bin .../textures/block/cable/cyan.png | Bin .../textures/block/cable/gray.png | Bin .../textures/block/cable/green.png | Bin .../textures/block/cable/light_blue.png | Bin .../textures/block/cable/light_gray.png | Bin .../textures/block/cable/lime.png | Bin .../textures/block/cable/magenta.png | Bin .../textures/block/cable/orange.png | Bin .../textures/block/cable/part_border.png | Bin .../textures/block/cable/pink.png | Bin .../textures/block/cable/purple.png | Bin .../textures/block/cable/red.png | Bin .../textures/block/cable/white.png | Bin .../textures/block/cable/yellow.png | Bin .../block/constructor/cutouts/active.png | Bin .../constructor/cutouts/active.png.mcmeta | 0 .../block/constructor/cutouts/inactive.png | Bin .../textures/block/constructor/front.png | Bin .../block/controller/cutouts/black.png | Bin .../block/controller/cutouts/black.png.mcmeta | 0 .../block/controller/cutouts/blue.png | Bin .../block/controller/cutouts/blue.png.mcmeta | 0 .../block/controller/cutouts/brown.png | Bin .../block/controller/cutouts/brown.png.mcmeta | 0 .../block/controller/cutouts/cyan.png | Bin .../block/controller/cutouts/cyan.png.mcmeta | 0 .../block/controller/cutouts/gray.png | Bin .../block/controller/cutouts/gray.png.mcmeta | 0 .../block/controller/cutouts/green.png | Bin .../block/controller/cutouts/green.png.mcmeta | 0 .../block/controller/cutouts/light_blue.png | Bin .../controller/cutouts/light_blue.png.mcmeta | 0 .../block/controller/cutouts/light_gray.png | Bin .../controller/cutouts/light_gray.png.mcmeta | 0 .../block/controller/cutouts/lime.png | Bin .../block/controller/cutouts/lime.png.mcmeta | 0 .../block/controller/cutouts/magenta.png | Bin .../controller/cutouts/magenta.png.mcmeta | 0 .../block/controller/cutouts/nearly_off.png | Bin .../controller/cutouts/nearly_off.png.mcmeta | 0 .../controller/cutouts/nearly_off_gray.png | Bin .../cutouts/nearly_off_gray.png.mcmeta | 0 .../block/controller/cutouts/nearly_on.png | Bin .../controller/cutouts/nearly_on.png.mcmeta | 0 .../controller/cutouts/nearly_on_gray.png | Bin .../cutouts/nearly_on_gray.png.mcmeta | 0 .../textures/block/controller/cutouts/off.png | Bin .../block/controller/cutouts/on.png.mcmeta | 0 .../block/controller/cutouts/orange.png | Bin .../controller/cutouts/orange.png.mcmeta | 0 .../block/controller/cutouts/pink.png | Bin .../block/controller/cutouts/pink.png.mcmeta | 0 .../block/controller/cutouts/purple.png | Bin .../controller/cutouts/purple.png.mcmeta | 0 .../textures/block/controller/cutouts/red.png | Bin .../block/controller/cutouts/red.png.mcmeta | 0 .../block/controller/cutouts/white.png | Bin .../block/controller/cutouts/white.png.mcmeta | 0 .../block/controller/cutouts/yellow.png | Bin .../controller/cutouts/yellow.png.mcmeta | 0 .../textures/block/controller/off.png | Bin .../textures/block/controller/on.png | Bin .../textures/block/crafting_grid/back.png | Bin .../block/crafting_grid/cutouts/black.png | Bin .../block/crafting_grid/cutouts/blue.png | Bin .../block/crafting_grid/cutouts/brown.png | Bin .../block/crafting_grid/cutouts/cyan.png | Bin .../block/crafting_grid/cutouts/gray.png | Bin .../block/crafting_grid/cutouts/green.png | Bin .../block/crafting_grid/cutouts/inactive.png | Bin .../crafting_grid/cutouts/light_blue.png | Bin .../crafting_grid/cutouts/light_gray.png | Bin .../block/crafting_grid/cutouts/lime.png | Bin .../block/crafting_grid/cutouts/magenta.png | Bin .../block/crafting_grid/cutouts/orange.png | Bin .../block/crafting_grid/cutouts/pink.png | Bin .../block/crafting_grid/cutouts/purple.png | Bin .../block/crafting_grid/cutouts/red.png | Bin .../block/crafting_grid/cutouts/white.png | Bin .../block/crafting_grid/cutouts/yellow.png | Bin .../textures/block/crafting_grid/front.png | Bin .../textures/block/crafting_grid/left.png | Bin .../textures/block/crafting_grid/right.png | Bin .../textures/block/crafting_grid/top.png | Bin .../block/destructor/cutouts/active.png | Bin .../destructor/cutouts/active.png.mcmeta | 0 .../block/destructor/cutouts/inactive.png | Bin .../textures/block/destructor/front.png | Bin .../textures/block/detector/bottom.png | Bin .../textures/block/detector/cutouts/black.png | Bin .../textures/block/detector/cutouts/blue.png | Bin .../textures/block/detector/cutouts/brown.png | Bin .../textures/block/detector/cutouts/cyan.png | Bin .../textures/block/detector/cutouts/gray.png | Bin .../textures/block/detector/cutouts/green.png | Bin .../block/detector/cutouts/light_blue.png | Bin .../block/detector/cutouts/light_gray.png | Bin .../textures/block/detector/cutouts/lime.png | Bin .../block/detector/cutouts/magenta.png | Bin .../block/detector/cutouts/orange.png | Bin .../textures/block/detector/cutouts/pink.png | Bin .../block/detector/cutouts/purple.png | Bin .../textures/block/detector/cutouts/red.png | Bin .../block/detector/cutouts/unpowered.png | Bin .../textures/block/detector/cutouts/white.png | Bin .../block/detector/cutouts/yellow.png | Bin .../textures/block/detector/side.png | Bin .../textures/block/detector/top.png | Bin .../textures/block/disk/disk.png | Bin .../textures/block/disk/fluid_disk.png | Bin .../textures/block/disk/leds.png | Bin .../textures/block/disk_drive/bottom.png | Bin .../textures/block/disk_drive/front.png | Bin .../textures/block/disk_drive/side.png | Bin .../textures/block/disk_drive/top.png | Bin .../textures/block/disk_interface/back.png | Bin .../block/disk_interface/cutouts/black.png | Bin .../block/disk_interface/cutouts/blue.png | Bin .../block/disk_interface/cutouts/brown.png | Bin .../block/disk_interface/cutouts/cyan.png | Bin .../block/disk_interface/cutouts/gray.png | Bin .../block/disk_interface/cutouts/green.png | Bin .../block/disk_interface/cutouts/inactive.png | Bin .../disk_interface/cutouts/light_blue.png | Bin .../disk_interface/cutouts/light_gray.png | Bin .../block/disk_interface/cutouts/lime.png | Bin .../block/disk_interface/cutouts/magenta.png | Bin .../block/disk_interface/cutouts/orange.png | Bin .../block/disk_interface/cutouts/pink.png | Bin .../block/disk_interface/cutouts/purple.png | Bin .../block/disk_interface/cutouts/red.png | Bin .../block/disk_interface/cutouts/white.png | Bin .../block/disk_interface/cutouts/yellow.png | Bin .../textures/block/disk_interface/front.png | Bin .../textures/block/disk_interface/left.png | Bin .../textures/block/disk_interface/right.png | Bin .../textures/block/disk_interface/top.png | Bin .../1024b_fluid_storage_block.png | Bin .../256b_fluid_storage_block.png | Bin .../4096b_fluid_storage_block.png | Bin .../64b_fluid_storage_block.png | Bin .../creative_fluid_storage_block.png | Bin .../textures/block/grid/back.png | Bin .../textures/block/grid/cutouts/black.png | Bin .../textures/block/grid/cutouts/blue.png | Bin .../textures/block/grid/cutouts/brown.png | Bin .../textures/block/grid/cutouts/cyan.png | Bin .../textures/block/grid/cutouts/gray.png | Bin .../textures/block/grid/cutouts/green.png | Bin .../textures/block/grid/cutouts/inactive.png | Bin .../block/grid/cutouts/light_blue.png | Bin .../block/grid/cutouts/light_gray.png | Bin .../textures/block/grid/cutouts/lime.png | Bin .../textures/block/grid/cutouts/magenta.png | Bin .../textures/block/grid/cutouts/orange.png | Bin .../textures/block/grid/cutouts/pink.png | Bin .../textures/block/grid/cutouts/purple.png | Bin .../textures/block/grid/cutouts/red.png | Bin .../textures/block/grid/cutouts/white.png | Bin .../textures/block/grid/cutouts/yellow.png | Bin .../textures/block/grid/front.png | Bin .../textures/block/grid/left.png | Bin .../textures/block/grid/right.png | Bin .../textures/block/grid/top.png | Bin .../textures/block/interface/active.png | Bin .../textures/block/interface/inactive.png | Bin .../textures/block/machine_casing.png | Bin .../textures/block/network_receiver/base.png | Bin .../block/network_receiver/cutouts/black.png | Bin .../block/network_receiver/cutouts/blue.png | Bin .../block/network_receiver/cutouts/brown.png | Bin .../block/network_receiver/cutouts/cyan.png | Bin .../block/network_receiver/cutouts/gray.png | Bin .../block/network_receiver/cutouts/green.png | Bin .../network_receiver/cutouts/inactive.png | Bin .../network_receiver/cutouts/light_blue.png | Bin .../network_receiver/cutouts/light_gray.png | Bin .../block/network_receiver/cutouts/lime.png | Bin .../network_receiver/cutouts/magenta.png | Bin .../block/network_receiver/cutouts/orange.png | Bin .../block/network_receiver/cutouts/pink.png | Bin .../block/network_receiver/cutouts/purple.png | Bin .../block/network_receiver/cutouts/red.png | Bin .../block/network_receiver/cutouts/white.png | Bin .../block/network_receiver/cutouts/yellow.png | Bin .../block/network_transmitter/base.png | Bin .../network_transmitter/cutouts/black.png | Bin .../network_transmitter/cutouts/blue.png | Bin .../network_transmitter/cutouts/brown.png | Bin .../network_transmitter/cutouts/cyan.png | Bin .../network_transmitter/cutouts/error.png | Bin .../network_transmitter/cutouts/gray.png | Bin .../network_transmitter/cutouts/green.png | Bin .../network_transmitter/cutouts/inactive.png | Bin .../cutouts/light_blue.png | Bin .../cutouts/light_gray.png | Bin .../network_transmitter/cutouts/lime.png | Bin .../network_transmitter/cutouts/magenta.png | Bin .../network_transmitter/cutouts/orange.png | Bin .../network_transmitter/cutouts/pink.png | Bin .../network_transmitter/cutouts/purple.png | Bin .../block/network_transmitter/cutouts/red.png | Bin .../network_transmitter/cutouts/white.png | Bin .../network_transmitter/cutouts/yellow.png | Bin .../block/portable_grid/portable_grid_1.png | Bin .../block/portable_grid/portable_grid_2.png | Bin .../portable_grid_2_inactive.png | Bin .../block/portable_grid/portable_grid_3.png | Bin .../block/portable_grid/portable_grid_4.png | Bin .../block/portable_grid/portable_grid_5.png | Bin .../block/portable_grid/portable_grid_6.png | Bin .../block/portable_grid/portable_grid_7.png | Bin .../block/portable_grid/portable_grid_8.png | Bin .../block/quartz_enriched_copper_block.png | Bin .../block/quartz_enriched_iron_block.png | Bin .../textures/block/relay/cutouts/.gitignore | 0 .../textures/block/relay/cutouts/in/black.png | Bin .../textures/block/relay/cutouts/in/blue.png | Bin .../textures/block/relay/cutouts/in/brown.png | Bin .../textures/block/relay/cutouts/in/cyan.png | Bin .../textures/block/relay/cutouts/in/gray.png | Bin .../textures/block/relay/cutouts/in/green.png | Bin .../block/relay/cutouts/in/inactive.png | Bin .../block/relay/cutouts/in/light_blue.png | Bin .../block/relay/cutouts/in/light_gray.png | Bin .../textures/block/relay/cutouts/in/lime.png | Bin .../block/relay/cutouts/in/magenta.png | Bin .../block/relay/cutouts/in/orange.png | Bin .../textures/block/relay/cutouts/in/pink.png | Bin .../block/relay/cutouts/in/purple.png | Bin .../textures/block/relay/cutouts/in/red.png | Bin .../textures/block/relay/cutouts/in/white.png | Bin .../block/relay/cutouts/in/yellow.png | Bin .../block/relay/cutouts/out/black.png | Bin .../textures/block/relay/cutouts/out/blue.png | Bin .../block/relay/cutouts/out/brown.png | Bin .../textures/block/relay/cutouts/out/cyan.png | Bin .../textures/block/relay/cutouts/out/gray.png | Bin .../block/relay/cutouts/out/green.png | Bin .../block/relay/cutouts/out/inactive.png | Bin .../block/relay/cutouts/out/light_blue.png | Bin .../block/relay/cutouts/out/light_gray.png | Bin .../textures/block/relay/cutouts/out/lime.png | Bin .../block/relay/cutouts/out/magenta.png | Bin .../block/relay/cutouts/out/orange.png | Bin .../textures/block/relay/cutouts/out/pink.png | Bin .../block/relay/cutouts/out/purple.png | Bin .../textures/block/relay/cutouts/out/red.png | Bin .../block/relay/cutouts/out/white.png | Bin .../block/relay/cutouts/out/yellow.png | Bin .../textures/block/relay/in.png | Bin .../textures/block/relay/out.png | Bin .../textures/block/security_manager/back.png | Bin .../security_manager/cutouts/back/black.png | Bin .../security_manager/cutouts/back/blue.png | Bin .../security_manager/cutouts/back/brown.png | Bin .../security_manager/cutouts/back/cyan.png | Bin .../security_manager/cutouts/back/gray.png | Bin .../security_manager/cutouts/back/green.png | Bin .../cutouts/back/inactive.png | Bin .../cutouts/back/light_blue.png | Bin .../cutouts/back/light_gray.png | Bin .../security_manager/cutouts/back/lime.png | Bin .../security_manager/cutouts/back/magenta.png | Bin .../security_manager/cutouts/back/orange.png | Bin .../security_manager/cutouts/back/pink.png | Bin .../security_manager/cutouts/back/purple.png | Bin .../security_manager/cutouts/back/red.png | Bin .../security_manager/cutouts/back/white.png | Bin .../security_manager/cutouts/back/yellow.png | Bin .../security_manager/cutouts/front/black.png | Bin .../security_manager/cutouts/front/blue.png | Bin .../security_manager/cutouts/front/brown.png | Bin .../security_manager/cutouts/front/cyan.png | Bin .../security_manager/cutouts/front/gray.png | Bin .../security_manager/cutouts/front/green.png | Bin .../cutouts/front/inactive.png | Bin .../cutouts/front/light_blue.png | Bin .../cutouts/front/light_gray.png | Bin .../security_manager/cutouts/front/lime.png | Bin .../cutouts/front/magenta.png | Bin .../security_manager/cutouts/front/orange.png | Bin .../security_manager/cutouts/front/pink.png | Bin .../security_manager/cutouts/front/purple.png | Bin .../security_manager/cutouts/front/red.png | Bin .../security_manager/cutouts/front/white.png | Bin .../security_manager/cutouts/front/yellow.png | Bin .../security_manager/cutouts/left/black.png | Bin .../security_manager/cutouts/left/blue.png | Bin .../security_manager/cutouts/left/brown.png | Bin .../security_manager/cutouts/left/cyan.png | Bin .../security_manager/cutouts/left/gray.png | Bin .../security_manager/cutouts/left/green.png | Bin .../cutouts/left/inactive.png | Bin .../cutouts/left/light_blue.png | Bin .../cutouts/left/light_gray.png | Bin .../security_manager/cutouts/left/lime.png | Bin .../security_manager/cutouts/left/magenta.png | Bin .../security_manager/cutouts/left/orange.png | Bin .../security_manager/cutouts/left/pink.png | Bin .../security_manager/cutouts/left/purple.png | Bin .../security_manager/cutouts/left/red.png | Bin .../security_manager/cutouts/left/white.png | Bin .../security_manager/cutouts/left/yellow.png | Bin .../security_manager/cutouts/right/black.png | Bin .../security_manager/cutouts/right/blue.png | Bin .../security_manager/cutouts/right/brown.png | Bin .../security_manager/cutouts/right/cyan.png | Bin .../security_manager/cutouts/right/gray.png | Bin .../security_manager/cutouts/right/green.png | Bin .../cutouts/right/inactive.png | Bin .../cutouts/right/light_blue.png | Bin .../cutouts/right/light_gray.png | Bin .../security_manager/cutouts/right/lime.png | Bin .../cutouts/right/magenta.png | Bin .../security_manager/cutouts/right/orange.png | Bin .../security_manager/cutouts/right/pink.png | Bin .../security_manager/cutouts/right/purple.png | Bin .../security_manager/cutouts/right/red.png | Bin .../security_manager/cutouts/right/white.png | Bin .../security_manager/cutouts/right/yellow.png | Bin .../security_manager/cutouts/top/black.png | Bin .../security_manager/cutouts/top/blue.png | Bin .../security_manager/cutouts/top/brown.png | Bin .../security_manager/cutouts/top/cyan.png | Bin .../security_manager/cutouts/top/gray.png | Bin .../security_manager/cutouts/top/green.png | Bin .../security_manager/cutouts/top/inactive.png | Bin .../cutouts/top/light_blue.png | Bin .../cutouts/top/light_gray.png | Bin .../security_manager/cutouts/top/lime.png | Bin .../security_manager/cutouts/top/magenta.png | Bin .../security_manager/cutouts/top/orange.png | Bin .../security_manager/cutouts/top/pink.png | Bin .../security_manager/cutouts/top/purple.png | Bin .../security_manager/cutouts/top/red.png | Bin .../security_manager/cutouts/top/white.png | Bin .../security_manager/cutouts/top/yellow.png | Bin .../textures/block/security_manager/front.png | Bin .../textures/block/security_manager/left.png | Bin .../textures/block/security_manager/right.png | Bin .../textures/block/security_manager/top.png | Bin .../refinedstorage/textures/block/side.png | Bin .../block/storage_block/16k_storage_block.png | Bin .../block/storage_block/1k_storage_block.png | Bin .../block/storage_block/4k_storage_block.png | Bin .../block/storage_block/64k_storage_block.png | Bin .../storage_block/creative_storage_block.png | Bin .../textures/block/storage_monitor/back.png | Bin .../textures/block/storage_monitor/front.png | Bin .../textures/block/storage_monitor/left.png | Bin .../textures/block/storage_monitor/right.png | Bin .../textures/block/storage_monitor/top.png | Bin .../block/wireless_transmitter/base.png | Bin .../wireless_transmitter/cutouts/black.png | Bin .../wireless_transmitter/cutouts/blue.png | Bin .../wireless_transmitter/cutouts/brown.png | Bin .../wireless_transmitter/cutouts/cyan.png | Bin .../wireless_transmitter/cutouts/gray.png | Bin .../wireless_transmitter/cutouts/green.png | Bin .../wireless_transmitter/cutouts/inactive.png | Bin .../cutouts/light_blue.png | Bin .../cutouts/light_gray.png | Bin .../wireless_transmitter/cutouts/lime.png | Bin .../wireless_transmitter/cutouts/magenta.png | Bin .../wireless_transmitter/cutouts/orange.png | Bin .../wireless_transmitter/cutouts/pink.png | Bin .../wireless_transmitter/cutouts/purple.png | Bin .../wireless_transmitter/cutouts/red.png | Bin .../wireless_transmitter/cutouts/white.png | Bin .../wireless_transmitter/cutouts/yellow.png | Bin .../textures/gui/advancements.png | Bin .../textures/gui/amount_with_inventory.png | Bin .../refinedstorage/textures/gui/book.png | Bin .../textures/gui/controller.png | Bin .../refinedstorage/textures/gui/crafting.png | Bin .../textures/gui/crafting_grid.png | Bin .../textures/gui/disk_drive.png | Bin .../textures/gui/disk_interface.png | Bin .../textures/gui/generic_filter.png | Bin .../refinedstorage/textures/gui/grid.png | Bin .../refinedstorage/textures/gui/interface.png | Bin .../textures/gui/network_transmitter.png | Bin .../textures/gui/portable_grid.png | Bin .../refinedstorage/textures/gui/priority.png | Bin .../textures/gui/resource_amount.png | Bin .../textures/gui/security_card.png | Bin .../textures/gui/security_manager.png | Bin .../textures/gui/sprites/widget/move_down.png | Bin .../gui/sprites/widget/move_down_disabled.png | Bin .../gui/sprites/widget/move_down_focused.png | Bin .../textures/gui/sprites/widget/move_up.png | Bin .../gui/sprites/widget/move_up_disabled.png | Bin .../gui/sprites/widget/move_up_focused.png | Bin .../refinedstorage/textures/gui/storage.png | Bin .../textures/gui/storage_monitor.png | Bin .../refinedstorage/textures/gui/widgets.png | Bin .../textures/gui/wireless_transmitter.png | Bin .../assets/refinedstorage/textures/icons.png | Bin .../item/1024b_fluid_storage_disk.png | Bin .../item/1024b_fluid_storage_part.png | Bin .../textures/item/16k_storage_disk.png | Bin .../textures/item/16k_storage_part.png | Bin .../textures/item/1k_storage_disk.png | Bin .../textures/item/1k_storage_part.png | Bin .../textures/item/256b_fluid_storage_disk.png | Bin .../textures/item/256b_fluid_storage_part.png | Bin .../item/4096b_fluid_storage_disk.png | Bin .../item/4096b_fluid_storage_part.png | Bin .../textures/item/4k_storage_disk.png | Bin .../textures/item/4k_storage_part.png | Bin .../textures/item/64b_fluid_storage_disk.png | Bin .../textures/item/64b_fluid_storage_part.png | Bin .../textures/item/64k_storage_disk.png | Bin .../textures/item/64k_storage_part.png | Bin .../textures/item/advanced_processor.png | Bin .../textures/item/basic_processor.png | Bin .../refinedstorage/textures/item/book.png | Bin .../item/configuration_card/active.png | Bin .../item/configuration_card/inactive.png | Bin .../textures/item/construction_core.png | Bin .../item/creative_fluid_storage_disk.png | Bin .../textures/item/creative_range_upgrade.png | Bin .../textures/item/creative_storage_disk.png | Bin .../textures/item/destruction_core.png | Bin .../textures/item/fortune_upgrade.png | Bin .../textures/item/improved_processor.png | Bin .../textures/item/network_card/active.png | Bin .../textures/item/network_card/inactive.png | Bin .../textures/item/processor_binding.png | Bin .../textures/item/quartz_enriched_copper.png | Bin .../textures/item/quartz_enriched_iron.png | Bin .../textures/item/range_upgrade.png | Bin .../textures/item/raw_advanced_processor.png | Bin .../textures/item/raw_basic_processor.png | Bin .../textures/item/raw_improved_processor.png | Bin .../textures/item/regulator_upgrade.png | Bin .../textures/item/security_card/active.png | Bin .../textures/item/security_card/fallback.png | Bin .../textures/item/security_card/inactive.png | Bin .../refinedstorage/textures/item/silicon.png | Bin .../textures/item/silk_touch_upgrade.png | Bin .../textures/item/speed_upgrade.png | Bin .../textures/item/stack_upgrade.png | Bin .../textures/item/storage_housing.png | Bin .../refinedstorage/textures/item/upgrade.png | Bin .../textures/item/wireless_grid/active.png | Bin .../textures/item/wireless_grid/inactive.png | Bin .../refinedstorage/textures/item/wrench.png | Bin .../data/c/tags/item/tools/wrench.json | 0 .../advancement/better_than_a_barrel.json | 0 .../advancement/conditional_connecting.json | 0 .../advancement/connecting.json | 0 .../advancement/construction.json | 0 .../advancement/destruction.json | 0 .../refinedstorage/advancement/detecting.json | 0 .../refinedstorage/advancement/drives.json | 0 .../refinedstorage/advancement/exporting.json | 0 .../refinedstorage/advancement/importing.json | 0 .../advancement/interface_to_the_world.json | 0 .../advancement/interfacing_with_disks.json | 0 .../advancement/no_cables_required.json | 0 .../advancement/portable_storage.json | 0 .../data/refinedstorage/advancement/root.json | 0 .../refinedstorage/advancement/security.json | 0 .../advancement/storing_externally.json | 0 .../advancement/storing_fluids.json | 0 .../advancement/storing_items.json | 0 .../refinedstorage/advancement/upgrading.json | 0 .../advancement/upgrading_your_grid.json | 0 .../advancement/viewing_your_storage.json | 0 .../refinedstorage/advancement/wireless.json | 0 .../blocks/1024b_fluid_storage_block.json | 0 .../loot_table/blocks/16k_storage_block.json | 0 .../loot_table/blocks/1k_storage_block.json | 0 .../blocks/256b_fluid_storage_block.json | 0 .../blocks/4096b_fluid_storage_block.json | 0 .../loot_table/blocks/4k_storage_block.json | 0 .../blocks/64b_fluid_storage_block.json | 0 .../loot_table/blocks/64k_storage_block.json | 0 .../blocks/creative_fluid_storage_block.json | 0 .../blocks/creative_portable_grid.json | 0 .../blocks/creative_storage_block.json | 0 .../loot_table/blocks/disk_drive.json | 0 .../loot_table/blocks/exporter.json | 0 .../loot_table/blocks/external_storage.json | 0 .../loot_table/blocks/importer.json | 0 .../loot_table/blocks/interface.json | 0 .../loot_table/blocks/machine_casing.json | 0 .../loot_table/blocks/portable_grid.json | 0 .../blocks/quartz_enriched_iron_block.json | 0 .../loot_table/blocks/storage_monitor.json | 0 .../recipe/1024b_fluid_storage_block.json | 0 .../recipe/1024b_fluid_storage_disk.json | 0 ...uid_storage_disk_from_storage_housing.json | 0 .../recipe/1024b_fluid_storage_part.json | 0 .../recipe/16k_storage_block.json | 0 .../recipe/16k_storage_disk.json | 0 ...16k_storage_disk_from_storage_housing.json | 0 .../recipe/16k_storage_part.json | 0 .../recipe/1k_storage_block.json | 0 .../recipe/1k_storage_disk.json | 0 .../1k_storage_disk_from_storage_housing.json | 0 .../recipe/1k_storage_part.json | 0 .../recipe/256b_fluid_storage_block.json | 0 .../recipe/256b_fluid_storage_disk.json | 0 ...uid_storage_disk_from_storage_housing.json | 0 .../recipe/256b_fluid_storage_part.json | 0 .../recipe/4096b_fluid_storage_block.json | 0 .../recipe/4096b_fluid_storage_disk.json | 0 ...uid_storage_disk_from_storage_housing.json | 0 .../recipe/4096b_fluid_storage_part.json | 0 .../recipe/4k_storage_block.json | 0 .../recipe/4k_storage_disk.json | 0 .../4k_storage_disk_from_storage_housing.json | 0 .../recipe/4k_storage_part.json | 0 .../recipe/64b_fluid_storage_block.json | 0 .../recipe/64b_fluid_storage_disk.json | 0 ...uid_storage_disk_from_storage_housing.json | 0 .../recipe/64b_fluid_storage_part.json | 0 .../recipe/64k_storage_block.json | 0 .../recipe/64k_storage_disk.json | 0 ...64k_storage_disk_from_storage_housing.json | 0 .../recipe/64k_storage_part.json | 0 .../recipe/advanced_processor.json | 0 .../recipe/basic_processor.json | 0 .../data/refinedstorage/recipe/cable.json | 0 .../recipe/configuration_card.json | 0 .../recipe/construction_core.json | 0 .../refinedstorage/recipe/constructor.json | 0 .../refinedstorage/recipe/controller.json | 0 .../refinedstorage/recipe/crafting_grid.json | 0 .../recipe/destruction_core.json | 0 .../refinedstorage/recipe/destructor.json | 0 .../data/refinedstorage/recipe/detector.json | 0 .../refinedstorage/recipe/disk_drive.json | 0 .../refinedstorage/recipe/disk_interface.json | 0 .../data/refinedstorage/recipe/exporter.json | 0 .../recipe/external_storage.json | 0 .../recipe/fallback_security_card.json | 0 .../recipe/fortune_1_upgrade.json | 0 .../recipe/fortune_2_upgrade.json | 0 .../recipe/fortune_3_upgrade.json | 0 .../data/refinedstorage/recipe/grid.json | 0 .../data/refinedstorage/recipe/importer.json | 0 .../recipe/improved_processor.json | 0 .../data/refinedstorage/recipe/interface.json | 0 .../refinedstorage/recipe/machine_casing.json | 0 .../refinedstorage/recipe/network_card.json | 0 .../recipe/network_receiver.json | 0 .../recipe/network_transmitter.json | 0 .../refinedstorage/recipe/portable_grid.json | 0 .../recipe/processor_binding.json | 0 .../recipe/quartz_enriched_copper.json | 0 .../recipe/quartz_enriched_copper_block.json | 0 .../quartz_enriched_copper_from_block.json | 0 .../recipe/quartz_enriched_iron.json | 0 .../recipe/quartz_enriched_iron_block.json | 0 .../quartz_enriched_iron_from_block.json | 0 .../refinedstorage/recipe/range_upgrade.json | 0 .../recipe/raw_advanced_processor.json | 0 .../recipe/raw_basic_processor.json | 0 .../recipe/raw_improved_processor.json | 0 .../recipe/regulator_upgrade.json | 0 .../data/refinedstorage/recipe/relay.json | 0 .../refinedstorage/recipe/security_card.json | 0 .../recipe/security_manager.json | 0 .../data/refinedstorage/recipe/silicon.json | 0 .../recipe/silk_touch_upgrade.json | 0 .../refinedstorage/recipe/speed_upgrade.json | 0 .../refinedstorage/recipe/stack_upgrade.json | 0 .../recipe/storage_housing.json | 0 .../recipe/storage_monitor.json | 0 .../data/refinedstorage/recipe/upgrade.json | 0 .../refinedstorage/recipe/wireless_grid.json | 0 .../recipe/wireless_transmitter.json | 0 .../data/refinedstorage/recipe/wrench.json | 0 .../common/SetupMinecraft.java | 2 +- .../refinedstorage}/common/TestPlatform.java | 16 +- .../common/grid/GridSortingTypesTest.java | 8 +- .../common/grid/screen/LastModifiedTest.java | 2 +- .../storage/ClientStorageRepositoryTest.java | 4 +- .../registry/PlatformRegistryImplTest.java | 6 +- .../resource/FluidResourceRenderingTest.java | 6 +- .../list/FuzzyResourceListImplTest.java | 14 +- .../common/support/widget/HistoryTest.java | 2 +- .../build.gradle.kts | 6 +- .../fabric/ClientModInitializerImpl.java | 84 +-- .../refinedstorage}/fabric/ConfigImpl.java | 14 +- .../fabric/ModInitializerImpl.java | 166 ++--- .../refinedstorage}/fabric/PlatformImpl.java | 44 +- ...torageExporterTransferStrategyFactory.java | 14 +- .../fabric/exporter/package-info.java | 7 + .../strategy/FluidGridExtractionStrategy.java | 18 +- .../strategy/FluidGridInsertionStrategy.java | 14 +- .../strategy/ItemGridExtractionStrategy.java | 14 +- .../strategy/ItemGridInsertionStrategy.java | 14 +- .../strategy/ItemGridScrollingStrategy.java | 16 +- .../fabric/grid/strategy/package-info.java | 7 + .../view/FabricFluidGridResourceFactory.java | 8 +- .../view/FabricItemGridResourceFactory.java | 4 +- .../fabric/grid/view/package-info.java | 7 + .../importer/FabricStorageImporterSource.java | 8 +- ...torageImporterTransferStrategyFactory.java | 10 +- .../fabric/importer/package-info.java | 7 + .../mixin/AbstractModelBakerImplMixin.java | 6 +- .../fabric/mixin/EditBoxAccessor.java | 2 +- .../fabric/mixin/ItemPropertiesAccessor.java | 2 +- .../fabric/mixin/KeyMappingAccessor.java | 2 +- .../fabric/mixin/ModelBakeryAccessor.java | 2 +- .../fabric/mixin/package-info.java | 7 + .../fabric/modmenu/ModMenuApiImpl.java | 4 +- .../fabric/modmenu/package-info.java | 7 + .../refinedstorage/fabric/package-info.java | 7 + ...NetworkNodeBreakSecurityEventListener.java | 8 +- .../fabric/security/package-info.java | 7 + .../AbstractDiskContainerBakedModel.java | 8 +- .../FabricStorageExtractableStorage.java | 4 +- .../FabricStorageInsertableStorage.java | 4 +- .../fabric/storage/FabricStorageUtil.java | 2 +- .../diskdrive/DiskDriveBakedModel.java | 12 +- .../DiskDriveBlockEntityRendererImpl.java | 10 +- .../diskdrive/DiskDriveUnbakedModel.java | 8 +- .../diskdrive/FabricDiskDriveBlockEntity.java | 4 +- .../storage/diskdrive/package-info.java | 7 + .../DiskInterfaceBakedModel.java | 16 +- .../DiskInterfaceBlockEntityRendererImpl.java | 10 +- .../DiskInterfaceUnbakedModel.java | 8 +- .../FabricDiskInterfaceBlockEntity.java | 4 +- .../storage/diskinterface/package-info.java | 7 + .../FabricStorageExternalStorageProvider.java | 8 +- ...latformExternalStorageProviderFactory.java | 4 +- .../storage/externalstorage/package-info.java | 7 + .../fabric/storage/package-info.java | 7 + .../fabric/storage/portablegrid/DiskLeds.java | 2 +- .../FabricPortableGridBlockEntity.java | 6 +- .../portablegrid/PortableGridBakedModel.java | 16 +- .../PortableGridBlockEntityRendererImpl.java | 10 +- .../PortableGridUnbakedModel.java | 8 +- .../storage/portablegrid/package-info.java | 7 + .../ContainerTransferDestination.java | 4 +- .../support/containermenu/MenuOpenerImpl.java | 6 +- .../support/containermenu/package-info.java | 7 + .../support/energy/EnergyStorageAdapter.java | 2 +- .../fabric/support/energy/package-info.java | 7 + .../support/render/EmissiveBakedModel.java | 2 +- .../support/render/EmissiveModelRegistry.java | 2 +- .../support/render/EmissiveTransform.java | 2 +- .../render/FluidVariantFluidRenderer.java | 8 +- .../fabric/support/render/QuadRotator.java | 4 +- .../fabric/support/render/QuadRotators.java | 4 +- .../fabric/support/render/QuadTranslator.java | 2 +- .../fabric/support/render/RenderTypes.java | 2 +- .../fabric/support/render/package-info.java | 7 + .../ResourceContainerFluidStorageAdapter.java | 12 +- .../fabric/support/resource/VariantUtil.java | 6 +- .../fabric/support/resource/package-info.java | 7 + .../fabric/util/SimpleSingleStackStorage.java | 2 +- .../fabric/util/package-info.java | 7 + .../src/main/resources/fabric.mod.json | 6 +- .../resources/refinedstorage.accesswidener | 0 .../main/resources/refinedstorage.mixins.json | 16 + .../grid/service/GridOperationsImplTest.java | 12 +- .../api/grid/view/GridViewImplTest.java | 4 +- .../build.gradle.kts | 8 +- .../neoforge/ClientModInitializer.java | 58 +- .../refinedstorage}/neoforge/ConfigImpl.java | 14 +- .../neoforge/ModInitializer.java | 156 ++--- .../neoforge/PlatformImpl.java | 34 +- .../datagen/BlockModelProviderImpl.java | 10 +- .../datagen/BlockStateProviderImpl.java | 36 +- .../neoforge/datagen/DataGenerators.java | 12 +- .../datagen/ItemModelProviderImpl.java | 30 +- .../datagen/loot/BlockDropProvider.java | 6 +- .../datagen/loot/LootTableProviderImpl.java | 2 +- .../neoforge/datagen/loot/package-info.java | 7 + .../neoforge/datagen/package-info.java | 7 + .../recipe/RecoloringRecipeProvider.java | 8 +- .../neoforge/datagen/recipe/package-info.java | 7 + .../datagen/tag/BlockTagsProvider.java | 4 +- .../datagen/tag/ItemTagsProviderImpl.java | 52 +- .../neoforge/datagen/tag/package-info.java | 7 + ...andlerExporterTransferStrategyFactory.java | 20 +- ...andlerExporterTransferStrategyFactory.java | 16 +- .../neoforge/exporter/package-info.java | 7 + .../grid/strategy/CursorItemHandler.java | 2 +- .../strategy/FluidGridExtractionStrategy.java | 18 +- .../strategy/FluidGridInsertionStrategy.java | 16 +- .../strategy/ItemGridExtractionStrategy.java | 18 +- .../strategy/ItemGridInsertionStrategy.java | 18 +- .../strategy/ItemGridScrollingStrategy.java | 22 +- .../neoforge/grid/strategy/package-info.java | 7 + .../view/ForgeFluidGridResourceFactory.java | 8 +- .../view/ForgeItemGridResourceFactory.java | 4 +- .../neoforge/grid/view/package-info.java | 7 + .../importer/FluidHandlerImporterSource.java | 10 +- ...andlerImporterTransferStrategyFactory.java | 12 +- .../importer/ItemHandlerImporterSource.java | 10 +- ...andlerImporterTransferStrategyFactory.java | 12 +- .../neoforge/importer/package-info.java | 7 + .../refinedstorage/neoforge/package-info.java | 7 + .../neoforge/storage/CapabilityCache.java | 6 +- .../neoforge/storage/CapabilityCacheImpl.java | 2 +- .../storage/DiskContainerItemOverrides.java | 8 +- .../FluidHandlerExtractableStorage.java | 10 +- .../FluidHandlerInsertableStorage.java | 10 +- .../neoforge/storage/ForgeHandlerUtil.java | 6 +- .../ItemHandlerExtractableStorage.java | 6 +- .../storage/ItemHandlerInsertableStorage.java | 6 +- .../diskdrive/DiskDriveBakedModel.java | 16 +- .../DiskDriveBlockEntityRendererImpl.java | 18 + .../diskdrive/DiskDriveGeometryLoader.java | 2 +- .../diskdrive/DiskDriveUnbakedGeometry.java | 10 +- .../diskdrive/ForgeDiskDriveBlockEntity.java | 6 +- .../storage/diskdrive/package-info.java | 7 + .../DiskInterfaceBakedModel.java | 18 +- .../DiskInterfaceBlockEntityRendererImpl.java | 18 + .../DiskInterfaceGeometryLoader.java | 2 +- .../DiskInterfaceUnbakedGeometry.java | 10 +- .../ForgeDiskInterfaceBlockEntity.java | 6 +- .../storage/diskinterface/package-info.java | 7 + .../FluidHandlerExternalStorageProvider.java | 10 +- ...latformExternalStorageProviderFactory.java | 6 +- .../ItemHandlerExternalStorageProvider.java | 10 +- ...latformExternalStorageProviderFactory.java | 6 +- .../storage/externalstorage/package-info.java | 7 + .../neoforge/storage/package-info.java | 7 + .../storage/portablegrid/DiskLedBakers.java | 4 +- .../ForgePortableGridBlockEntity.java | 8 +- .../portablegrid/PortableGridBakedModel.java | 20 +- .../PortableGridBlockEntityRendererImpl.java | 10 +- .../PortableGridGeometryLoader.java | 2 +- .../PortableGridUnbakedGeometry.java | 10 +- .../storage/portablegrid/package-info.java | 7 + .../ContainerTransferDestination.java | 4 +- .../support/containermenu/MenuOpenerImpl.java | 6 +- .../support/containermenu/package-info.java | 7 + .../support/energy/EnergyStorageAdapter.java | 2 +- .../neoforge/support/energy/package-info.java | 7 + .../inventory/InsertExtractItemHandler.java | 2 +- .../support/inventory}/package-info.java | 2 +- .../support/render/DiskModelBaker.java | 4 +- .../render/FluidStackFluidRenderer.java | 6 +- .../support/render/ItemBakedModel.java | 2 +- .../neoforge/support/render/RenderTypes.java | 2 +- .../render/RotationTranslationModelBaker.java | 2 +- .../support/render/TransformationBuilder.java | 4 +- .../neoforge/support/render/package-info.java | 7 + .../ResourceContainerFluidHandlerAdapter.java | 14 +- .../support/resource/VariantUtil.java | 4 +- .../support/resource/package-info.java | 7 + .../resources/META-INF/accesstransformer.cfg | 0 .../resources/META-INF/neoforge.mods.toml | 10 +- .../src/main/resources/icon.png | Bin .../src/main/resources/pack.mcmeta | 0 .../refinedstorage}/common/GameTestUtil.java | 22 +- .../ConstructorTest.java | 31 +- .../ConstructorTestPlots.java | 10 +- .../constructordestructor/DestructorTest.java | 29 +- .../DestructorTestPlots.java | 10 +- .../common/exporter/ExporterTest.java | 33 +- .../common/exporter/ExporterTestPlots.java | 10 +- .../common/importer/ImporterTest.java | 28 +- .../common/importer/ImporterTestPlots.java | 14 +- .../refinedstorage/structure/empty_15x15.nbt | Bin .../platform/api/security/package-info.java | 7 - .../api/storage/channel/package-info.java | 7 - .../storage/externalstorage/package-info.java | 7 - .../api/storagemonitor/package-info.java | 7 - .../api/support/energy/package-info.java | 7 - .../network/bounditem/package-info.java | 7 - .../api/support/network/package-info.java | 7 - .../api/support/registry/package-info.java | 7 - .../support/resource/list/package-info.java | 7 - .../api/support/resource/package-info.java | 7 - .../support/slotreference/package-info.java | 7 - .../platform/api/upgrade/package-info.java | 7 - .../api/wirelesstransmitter/package-info.java | 7 - .../configurationcard/package-info.java | 7 - .../constructordestructor/package-info.java | 7 - .../platform/common/content/package-info.java | 7 - .../common/controller/ControllerType.java | 6 - .../platform/common/grid/package-info.java | 7 - .../common/grid/screen/hint/package-info.java | 7 - .../common/grid/screen/package-info.java | 7 - .../strategy/ClientGridScrollingStrategy.java | 14 - .../common/grid/strategy/package-info.java | 7 - .../platform/common/iface/package-info.java | 7 - .../platform/common/misc/package-info.java | 7 - .../common/networking/package-info.java | 7 - .../storage/diskdrive/package-info.java | 7 - .../storage/diskinterface/package-info.java | 7 - .../storage/externalstorage/package-info.java | 7 - .../platform/common/storage/package-info.java | 7 - .../PortableGridBlockItemRenderInfo.java | 6 - .../portablegrid/PortableGridType.java | 6 - .../storage/portablegrid/package-info.java | 7 - .../storage/storageblock/package-info.java | 7 - .../storage/storagedisk/package-info.java | 7 - .../common/storagemonitor/package-info.java | 7 - .../common/support/CableShapeCacheKey.java | 23 - .../common/support/amount/package-info.java | 7 - .../support/containermenu/package-info.java | 7 - .../support/direction/package-info.java | 7 - .../common/support/energy/package-info.java | 7 - .../network/bounditem/package-info.java | 7 - .../network/component/package-info.java | 7 - .../common/support/network/package-info.java | 7 - .../platform/common/support/package-info.java | 7 - .../support/packet/c2s/package-info.java | 7 - .../common/support/packet/package-info.java | 7 - .../support/packet/s2c/package-info.java | 7 - .../common/support/registry/package-info.java | 7 - .../common/support/render/package-info.java | 7 - .../support/resource/list/package-info.java | 7 - .../common/support/resource/package-info.java | 7 - .../support/slotreference/package-info.java | 7 - .../support/stretching/package-info.java | 7 - .../common/support/tooltip/package-info.java | 7 - .../common/support/widget/package-info.java | 7 - .../platform/common/upgrade/package-info.java | 7 - .../platform/common/util/package-info.java | 7 - .../BaseWirelessTransmitterRangeModifier.java | 12 - .../wirelesstransmitter/package-info.java | 7 - .../fabric/exporter/package-info.java | 7 - .../fabric/grid/strategy/package-info.java | 7 - .../fabric/importer/package-info.java | 7 - .../platform/fabric/mixin/package-info.java | 7 - .../platform/fabric/modmenu/package-info.java | 7 - .../fabric/security/package-info.java | 7 - .../storage/diskdrive/package-info.java | 7 - .../storage/diskinterface/package-info.java | 7 - .../storage/externalstorage/package-info.java | 7 - .../platform/fabric/storage/package-info.java | 7 - .../storage/portablegrid/package-info.java | 7 - .../support/containermenu/package-info.java | 7 - .../fabric/support/energy/package-info.java | 7 - .../fabric/support/render/package-info.java | 7 - .../fabric/support/resource/package-info.java | 7 - .../platform/fabric/util/package-info.java | 7 - .../main/resources/refinedstorage.mixins.json | 16 - .../neoforge/datagen/loot/package-info.java | 7 - .../neoforge/datagen/recipe/package-info.java | 7 - .../neoforge/datagen/tag/package-info.java | 7 - .../neoforge/exporter/package-info.java | 7 - .../neoforge/grid/strategy/package-info.java | 7 - .../neoforge/grid/view/package-info.java | 7 - .../neoforge/importer/package-info.java | 7 - .../platform/neoforge/package-info.java | 7 - .../DiskDriveBlockEntityRendererImpl.java | 18 - .../storage/diskdrive/package-info.java | 7 - .../DiskInterfaceBlockEntityRendererImpl.java | 18 - .../storage/diskinterface/package-info.java | 7 - .../storage/externalstorage/package-info.java | 7 - .../storage/portablegrid/package-info.java | 7 - .../support/containermenu/package-info.java | 7 - .../neoforge/support/energy/package-info.java | 7 - .../support/inventory/package-info.java | 7 - .../neoforge/support/render/package-info.java | 7 - .../support/resource/package-info.java | 7 - .../channel/StorageChannelImplTest.java | 2 +- .../tracked/TrackedStorageImplTest.java | 14 +- settings.gradle.kts | 8 +- 3219 files changed, 4976 insertions(+), 5011 deletions(-) rename {refinedstorage-platform-api => refinedstorage-common-api}/build.gradle.kts (92%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/PlatformApi.java (67%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/PlatformApiProxy.java (80%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/RefinedStoragePlugin.java (78%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/configurationcard/ConfigurationCardTarget.java (91%) create mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/configurationcard/package-info.java rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/constructordestructor/ConstructorStrategy.java (86%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/constructordestructor/ConstructorStrategyFactory.java (82%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/constructordestructor/DestructorStrategy.java (92%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/constructordestructor/DestructorStrategyFactory.java (82%) create mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/package-info.java rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/exporter/AmountOverride.java (92%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/exporter/ExporterTransferStrategyFactory.java (81%) create mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/exporter/package-info.java rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/grid/Grid.java (86%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/grid/GridInsertionHint.java (86%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/grid/GridInsertionHints.java (86%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/grid/GridResourceAttributeKeys.java (83%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/grid/GridScrollMode.java (62%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/grid/GridSynchronizer.java (91%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid}/package-info.java (78%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/grid/strategy/GridExtractionStrategy.java (66%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/grid/strategy/GridExtractionStrategyFactory.java (74%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/grid/strategy/GridInsertionStrategy.java (83%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/grid/strategy/GridInsertionStrategyFactory.java (74%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/grid/strategy/GridScrollingStrategy.java (50%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/grid/strategy/GridScrollingStrategyFactory.java (74%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy}/package-info.java (76%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/grid/view/AbstractPlatformGridResource.java (97%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/grid/view/PlatformGridResource.java (75%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/view}/package-info.java (77%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/importer/ImporterTransferStrategyFactory.java (73%) create mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/importer/package-info.java rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/package-info.java (79%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/security/BuiltinPermissions.java (84%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/security/PlatformPermission.java (92%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/security/PlatformSecurityNetworkComponent.java (88%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/security/SecurityHelper.java (89%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/security/SecurityPolicyContainerItem.java (94%) create mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/package-info.java rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/storage/AbstractStorageContainerBlockItem.java (96%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/storage/AbstractStorageContainerItem.java (96%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/storage/PlayerActor.java (90%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/storage/SerializableStorage.java (81%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/storage/StorageBlockEntity.java (87%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/storage/StorageContainerItem.java (90%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/storage/StorageContainerItemHelper.java (97%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/storage/StorageInfo.java (90%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/storage/StorageRepository.java (94%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/storage/StorageType.java (89%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/storage/channel/FuzzyStorageChannel.java (86%) create mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/channel/package-info.java rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/storage/externalstorage/PlatformExternalStorageProviderFactory.java (87%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/externalstorage}/package-info.java (73%) create mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/package-info.java rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/storagemonitor/StorageMonitorExtractionStrategy.java (88%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/storagemonitor/StorageMonitorInsertionStrategy.java (88%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storagemonitor}/package-info.java (76%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/AmountFormatting.java (96%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/HelpTooltipComponent.java (88%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/energy/AbstractEnergyBlockItem.java (96%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/energy/AbstractEnergyItem.java (95%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/energy/AbstractNetworkBoundEnergyItem.java (85%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/energy/EnergyItemHelper.java (90%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/energy/TransferableBlockEntityEnergy.java (79%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/view => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy}/package-info.java (76%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/network/AbstractNetworkNodeContainerBlockEntity.java (95%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/network/ConnectionLogic.java (82%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/network/ConnectionSink.java (83%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/network/InWorldNetworkNodeContainer.java (88%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/network/NetworkNodeContainerBlockEntity.java (69%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/network/bounditem/NetworkBoundItemHelper.java (82%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/network/bounditem/NetworkBoundItemSession.java (80%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/network/bounditem/NetworkBoundItemTargetBlockEntity.java (79%) create mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/package-info.java create mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/package-info.java create mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/package-info.java rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/registry/PlatformRegistry.java (95%) create mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/registry/package-info.java rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/resource/AbstractResourceType.java (95%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/resource/FluidOperationResult.java (77%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/resource/FuzzyModeNormalizer.java (76%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/resource/PlatformResourceKey.java (80%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/resource/RecipeModIngredientConverter.java (82%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/resource/ResourceContainer.java (96%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/resource/ResourceContainerInsertStrategy.java (94%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/resource/ResourceFactory.java (86%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/resource/ResourceRendering.java (92%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/resource/ResourceType.java (95%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/resource/list/FuzzyResourceList.java (81%) create mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/list/package-info.java create mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/package-info.java rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/slotreference/SlotReference.java (83%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/slotreference/SlotReferenceFactory.java (89%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/slotreference/SlotReferenceHandlerItem.java (81%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/support/slotreference/SlotReferenceProvider.java (81%) create mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/package-info.java rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/upgrade/AbstractUpgradeItem.java (94%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/upgrade/UpgradeDestination.java (82%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/upgrade/UpgradeItem.java (72%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/upgrade/UpgradeMapping.java (90%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/upgrade/UpgradeRegistry.java (91%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/upgrade/UpgradeState.java (78%) create mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/package-info.java rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/wirelesstransmitter/WirelessTransmitter.java (82%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common}/api/wirelesstransmitter/WirelessTransmitterRangeModifier.java (66%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/configurationcard => refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/wirelesstransmitter}/package-info.java (74%) rename {refinedstorage-platform-api/src/test/java/com/refinedmods/refinedstorage/platform => refinedstorage-common-api/src/test/java/com/refinedmods/refinedstorage/common}/api/support/AmountFormattingTest.java (98%) rename {refinedstorage-platform-common => refinedstorage-common}/build.gradle.kts (87%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/black_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/black_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/black_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/black_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/black_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/black_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/black_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/black_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/black_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/black_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/black_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/black_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/black_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/black_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/black_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/black_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/black_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/blue_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/blue_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/blue_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/blue_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/blue_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/blue_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/blue_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/blue_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/blue_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/blue_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/blue_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/blue_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/blue_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/blue_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/blue_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/blue_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/blue_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/brown_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/brown_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/brown_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/brown_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/brown_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/brown_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/brown_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/brown_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/brown_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/brown_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/brown_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/brown_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/brown_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/brown_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/brown_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/brown_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/brown_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/cyan_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/cyan_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/cyan_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/cyan_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/cyan_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/cyan_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/cyan_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/cyan_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/cyan_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/cyan_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/cyan_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/cyan_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/cyan_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/cyan_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/cyan_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/cyan_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/gray_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/gray_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/gray_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/gray_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/gray_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/gray_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/gray_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/gray_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/gray_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/gray_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/gray_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/green_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/green_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/green_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/green_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/green_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/green_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/green_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/green_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/green_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/green_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/green_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/green_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/green_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/green_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/green_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/green_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/green_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_blue_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_blue_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_blue_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_blue_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_blue_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_blue_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_gray_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_gray_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_gray_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_gray_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_gray_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_gray_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_gray_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_gray_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_gray_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_gray_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_gray_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_gray_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_gray_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_gray_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_gray_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/light_gray_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/lime_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/lime_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/lime_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/lime_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/lime_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/lime_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/lime_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/lime_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/lime_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/lime_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/lime_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/lime_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/lime_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/lime_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/lime_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/lime_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/lime_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/magenta_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/magenta_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/magenta_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/magenta_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/magenta_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/magenta_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/magenta_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/magenta_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/magenta_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/magenta_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/magenta_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/magenta_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/magenta_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/magenta_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/magenta_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/magenta_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/orange_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/orange_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/orange_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/orange_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/orange_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/orange_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/orange_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/orange_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/orange_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/orange_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/orange_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/orange_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/orange_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/orange_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/orange_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/orange_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/orange_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/pink_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/pink_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/pink_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/pink_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/pink_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/pink_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/pink_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/pink_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/pink_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/pink_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/pink_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/pink_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/pink_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/pink_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/pink_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/pink_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/pink_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/purple_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/purple_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/purple_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/purple_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/purple_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/purple_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/purple_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/purple_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/purple_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/purple_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/purple_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/purple_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/purple_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/purple_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/purple_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/purple_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/purple_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/red_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/red_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/red_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/red_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/red_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/red_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/red_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/red_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/red_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/red_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/red_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/red_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/red_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/red_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/red_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/red_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/red_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/white_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/white_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/white_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/white_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/white_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/white_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/white_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/white_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/white_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/white_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/white_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/white_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/white_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/white_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/white_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/white_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/white_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/yellow_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/yellow_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/yellow_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/yellow_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/yellow_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/yellow_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/yellow_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/yellow_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/yellow_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/yellow_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/yellow_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/yellow_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/yellow_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/yellow_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/yellow_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/blockstates/yellow_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/core/black.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/core/blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/core/brown.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/core/cyan.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/core/gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/core/green.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/core/light_blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/core/light_gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/core/lime.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/core/magenta.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/core/orange.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/core/pink.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/core/purple.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/core/red.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/core/white.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/core/yellow.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/extension/black.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/extension/blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/extension/brown.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/extension/cyan.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/extension/gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/extension/green.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/extension/light_blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/extension/light_gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/extension/lime.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/extension/magenta.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/extension/orange.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/extension/pink.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/extension/purple.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/extension/red.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/extension/white.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/cable/extension/yellow.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/controller/black.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/controller/blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/controller/brown.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/controller/cyan.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/controller/gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/controller/green.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/controller/light_blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/controller/light_gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/controller/lime.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/controller/magenta.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/controller/orange.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/controller/pink.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/controller/purple.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/controller/red.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/controller/white.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/controller/yellow.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/black.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/brown.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/cyan.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/green.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/inactive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/lime.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/magenta.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/orange.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/pink.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/purple.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/red.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/white.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/yellow.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/detector/black.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/detector/blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/detector/brown.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/detector/cyan.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/detector/gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/detector/green.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/detector/light_blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/detector/light_gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/detector/lime.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/detector/magenta.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/detector/orange.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/detector/pink.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/detector/purple.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/detector/red.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/detector/white.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/detector/yellow.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_black.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_brown.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_cyan.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_green.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_light_blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_light_gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_lime.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_magenta.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_orange.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_pink.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_purple.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_red.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_white.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_yellow.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/black.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/brown.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/cyan.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/green.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/inactive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/light_blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/light_gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/lime.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/magenta.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/orange.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/pink.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/purple.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/red.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/white.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/disk_interface/yellow.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/grid/black.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/grid/blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/grid/brown.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/grid/cyan.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/grid/gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/grid/green.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/grid/inactive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/grid/light_blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/grid/light_gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/grid/lime.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/grid/magenta.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/grid/orange.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/grid/pink.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/grid/purple.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/grid/red.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/grid/white.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/grid/yellow.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_receiver/black.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_receiver/blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_receiver/brown.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_receiver/cyan.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_receiver/gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_receiver/green.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_receiver/inactive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_receiver/lime.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_receiver/magenta.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_receiver/orange.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_receiver/pink.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_receiver/purple.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_receiver/red.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_receiver/white.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_receiver/yellow.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/black.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/brown.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/cyan.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/error.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/green.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/inactive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/lime.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/magenta.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/orange.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/pink.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/purple.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/red.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/white.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/yellow.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/relay/black.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/relay/blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/relay/brown.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/relay/cyan.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/relay/gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/relay/green.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/relay/inactive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/relay/light_blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/relay/light_gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/relay/lime.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/relay/magenta.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/relay/orange.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/relay/pink.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/relay/purple.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/relay/red.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/relay/white.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/relay/yellow.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/security_manager/black.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/security_manager/blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/security_manager/brown.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/security_manager/cyan.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/security_manager/gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/security_manager/green.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/security_manager/inactive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/security_manager/lime.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/security_manager/magenta.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/security_manager/orange.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/security_manager/pink.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/security_manager/purple.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/security_manager/red.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/security_manager/white.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/security_manager/yellow.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/black.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/brown.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/cyan.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/green.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/light_blue.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/light_gray.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/lime.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/magenta.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/orange.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/pink.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/purple.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/red.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/white.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/yellow.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/black_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/black_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/black_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/black_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/black_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/black_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/black_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/black_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/black_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/black_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/black_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/black_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/black_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/black_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/black_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/black_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/black_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/blue_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/blue_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/blue_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/blue_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/blue_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/blue_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/blue_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/blue_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/blue_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/blue_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/blue_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/blue_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/blue_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/blue_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/blue_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/blue_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/blue_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/brown_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/brown_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/brown_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/brown_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/brown_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/brown_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/brown_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/brown_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/brown_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/brown_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/brown_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/brown_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/brown_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/brown_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/brown_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/brown_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/brown_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/cyan_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/cyan_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/cyan_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/cyan_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/cyan_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/cyan_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/cyan_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/cyan_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/cyan_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/cyan_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/cyan_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/cyan_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/cyan_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/cyan_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/cyan_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/cyan_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/cyan_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/gray_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/gray_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/gray_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/gray_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/gray_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/gray_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/gray_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/gray_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/gray_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/gray_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/gray_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/green_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/green_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/green_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/green_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/green_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/green_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/green_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/green_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/green_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/green_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/green_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/green_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/green_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/green_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/green_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/green_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/green_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_blue_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_blue_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_blue_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_blue_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_blue_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_blue_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_gray_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_gray_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_gray_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_gray_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_gray_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_gray_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_gray_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_gray_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_gray_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_gray_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_gray_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_gray_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_gray_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_gray_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_gray_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_gray_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/light_gray_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/lime_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/lime_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/lime_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/lime_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/lime_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/lime_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/lime_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/lime_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/lime_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/lime_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/lime_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/lime_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/lime_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/lime_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/lime_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/lime_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/lime_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/magenta_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/magenta_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/magenta_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/magenta_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/magenta_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/magenta_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/magenta_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/magenta_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/magenta_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/magenta_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/magenta_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/magenta_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/magenta_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/magenta_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/magenta_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/magenta_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/magenta_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/orange_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/orange_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/orange_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/orange_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/orange_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/orange_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/orange_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/orange_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/orange_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/orange_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/orange_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/orange_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/orange_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/orange_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/orange_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/orange_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/orange_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/pink_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/pink_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/pink_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/pink_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/pink_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/pink_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/pink_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/pink_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/pink_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/pink_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/pink_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/pink_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/pink_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/pink_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/pink_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/pink_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/pink_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/purple_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/purple_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/purple_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/purple_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/purple_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/purple_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/purple_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/purple_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/purple_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/purple_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/purple_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/purple_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/purple_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/purple_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/purple_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/purple_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/purple_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/red_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/red_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/red_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/red_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/red_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/red_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/red_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/red_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/red_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/red_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/red_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/red_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/red_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/red_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/red_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/red_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/red_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/white_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/white_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/white_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/white_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/white_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/white_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/white_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/white_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/white_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/white_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/white_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/white_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/white_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/white_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/white_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/white_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/white_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/yellow_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/yellow_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/yellow_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/yellow_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/yellow_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/yellow_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/yellow_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/yellow_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/yellow_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/yellow_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/yellow_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/yellow_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/yellow_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/yellow_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/yellow_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/yellow_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/assets/refinedstorage/models/item/yellow_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/black_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/black_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/black_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/black_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/black_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/black_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/black_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/black_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/black_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/black_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/black_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/black_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/black_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/black_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/green_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/green_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/green_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/green_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/green_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/green_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/green_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/green_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/green_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/green_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/green_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/green_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/green_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/green_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/red_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/red_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/red_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/red_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/red_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/red_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/red_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/red_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/red_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/red_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/red_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/red_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/red_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/red_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/white_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/white_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/white_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/white_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/white_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/white_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/white_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/white_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/white_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/white_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/white_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/white_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/white_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/white_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_creative_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/black_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/black_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/black_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/black_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/black_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/black_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/black_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/black_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/black_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/black_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/black_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/black_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/black_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/black_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/black_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/black_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/blue_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/blue_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/blue_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/blue_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/blue_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/blue_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/blue_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/blue_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/blue_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/blue_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/blue_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/blue_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/blue_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/blue_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/blue_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/blue_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/brown_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/brown_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/brown_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/brown_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/brown_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/brown_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/brown_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/brown_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/brown_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/brown_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/brown_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/brown_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/brown_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/brown_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/brown_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/brown_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/gray_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/gray_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/gray_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/gray_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/gray_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/gray_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/gray_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/gray_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/gray_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/gray_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/gray_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/gray_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/gray_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/gray_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/gray_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/gray_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/green_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/green_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/green_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/green_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/green_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/green_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/green_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/green_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/green_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/green_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/green_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/green_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/green_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/green_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/green_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/green_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/lime_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/lime_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/lime_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/lime_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/lime_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/lime_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/lime_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/lime_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/lime_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/lime_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/lime_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/lime_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/lime_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/lime_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/lime_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/lime_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/orange_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/orange_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/orange_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/orange_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/orange_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/orange_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/orange_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/orange_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/orange_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/orange_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/orange_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/orange_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/orange_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/orange_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/orange_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/orange_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/pink_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/pink_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/pink_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/pink_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/pink_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/pink_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/pink_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/pink_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/pink_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/pink_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/pink_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/pink_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/pink_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/pink_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/pink_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/pink_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/purple_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/purple_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/purple_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/purple_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/purple_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/purple_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/purple_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/purple_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/purple_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/purple_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/purple_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/purple_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/purple_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/purple_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/purple_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/purple_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/red_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/red_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/red_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/red_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/red_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/red_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/red_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/red_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/red_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/red_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/red_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/red_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/red_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/red_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/red_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/red_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/white_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/white_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/white_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/white_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/white_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/white_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/white_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/white_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/white_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/white_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/white_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/white_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/white_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/white_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/white_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/white_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/tags/item/cables.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/tags/item/constructors.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/tags/item/controllers.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/tags/item/crafting_grids.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/tags/item/creative_controllers.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/tags/item/destructors.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/tags/item/detectors.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/tags/item/disk_interfaces.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/tags/item/exporters.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/tags/item/external_storages.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/tags/item/fluid_storage_disks.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/tags/item/grids.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/tags/item/importers.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/tags/item/network_receivers.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/tags/item/network_transmitters.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/tags/item/relays.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/tags/item/security_managers.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/tags/item/storage_disks.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/generated/resources/data/refinedstorage/tags/item/wireless_transmitters.json (100%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/AbstractClientModInitializer.java (61%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/AbstractModInitializer.java (61%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/AbstractPlatform.java (75%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/Config.java (93%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/Platform.java (87%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/PlatformApiImpl.java (75%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/PlatformProxy.java (92%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/configurationcard/ConfigurationCardItem.java (94%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/configurationcard/ConfigurationCardItemPropertyFunction.java (84%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/configurationcard/ConfigurationCardState.java (96%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/configurationcard}/package-info.java (76%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/AbstractConstructorDestructorBlock.java (86%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/AbstractItemConstructorStrategy.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/BlockBreakDestructorStrategy.java (93%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/BlockBreakDestructorStrategyFactory.java (83%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/CompositeConstructorStrategy.java (85%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/CompositeDestructorStrategy.java (85%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/ConstructorBlock.java (63%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/ConstructorBlockEntity.java (87%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/ConstructorContainerMenu.java (68%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/ConstructorDestructorPropertyTypes.java (51%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/ConstructorDropItemsSideButtonWidget.java (54%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/ConstructorScreen.java (68%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/DestructorBlock.java (59%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/DestructorBlockEntity.java (83%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/DestructorContainerMenu.java (69%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/DestructorPickupItemsSideButtonWidget.java (54%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/DestructorScreen.java (66%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/FluidBreakDestructorStrategy.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/FluidBreakDestructorStrategyFactory.java (67%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/ItemDropConstructorStrategy.java (94%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/ItemDropConstructorStrategyFactory.java (70%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/ItemPickupDestructorStrategy.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/ItemPickupDestructorStrategyFactory.java (71%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/PlaceBlockConstructorStrategy.java (86%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/PlaceFireworksConstructorStrategy.java (93%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/constructordestructor/PlaceFluidConstructorStrategy.java (86%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/BlockColorMap.java (96%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/BlockConstants.java (89%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/BlockEntities.java (80%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/BlockEntityTypeFactory.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/BlockFactory.java (80%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/Blocks.java (79%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/ColorMap.java (97%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/ContentIds.java (93%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/ContentNames.java (89%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/CreativeModeTabItems.java (95%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/DataComponents.java (88%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/DefaultEnergyUsage.java (97%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/DirectRegistryCallback.java (87%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/ExtendedMenuTypeFactory.java (91%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/Items.java (94%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/KeyMappings.java (96%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/LootFunctions.java (80%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/MenuTypeFactory.java (87%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/Menus.java (79%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/RegistryCallback.java (78%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/Sounds.java (88%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/content/Tags.java (91%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content}/package-info.java (78%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/controller/AbstractControllerBlock.java (87%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/controller/ControllerBlock.java (77%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/controller/ControllerBlockEntity.java (84%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/controller/ControllerBlockEntityTicker.java (84%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/controller/ControllerBlockItem.java (78%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/controller/ControllerContainerMenu.java (69%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/controller/ControllerData.java (87%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/controller/ControllerEnergyType.java (91%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/controller/ControllerItemPropertyFunction.java (87%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/controller/ControllerScreen.java (71%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerType.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/controller/CreativeControllerBlock.java (79%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/controller/CreativeControllerBlockItem.java (63%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller}/package-info.java (78%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/detector/DetectorBlock.java (79%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/detector/DetectorBlockEntity.java (85%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/detector/DetectorContainerMenu.java (69%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/detector/DetectorModeSettings.java (92%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/detector/DetectorModeSideButtonWidget.java (84%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/detector/DetectorPropertyTypes.java (60%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/detector/DetectorScreen.java (67%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/detector/FuzzyDetectorAmountStrategy.java (88%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/exporter/ExporterBlock.java (73%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/exporter/ExporterBlockEntity.java (84%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/exporter/ExporterContainerMenu.java (65%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/exporter/ExporterScreen.java (62%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/exporter/FuzzyExporterTransferStrategy.java (88%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/AbstractGridBlock.java (56%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/AbstractGridBlockEntity.java (82%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/AbstractGridContainerMenu.java (88%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/AbstractGridSynchronizer.java (59%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/ClientCraftingGridSource.java (88%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/CraftingGridBlock.java (69%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/CraftingGridBlockEntity.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/CraftingGridContainerMenu.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/CraftingGridMatrixCloseBehavior.java (63%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/CraftingGridRefillContext.java (58%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/CraftingGridRefillContextImpl.java (78%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/CraftingGridResultSlot.java (95%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/CraftingGridSource.java (84%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/CraftingGridSourceImpl.java (97%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/CraftingMatrix.java (88%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/CraftingMatrixContainerMenu.java (93%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/GridBlock.java (68%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/GridBlockEntity.java (75%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/GridContainerMenu.java (62%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/GridData.java (81%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/GridSearchBox.java (79%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/GridSortingTypes.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/NoopGridSynchronizer.java (85%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/PortableGridData.java (75%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/SecuredGridOperations.java (85%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/SnapshotCraftingGridRefillContext.java (93%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/WirelessGrid.java (88%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/WirelessGridContainerMenu.java (76%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/WirelessGridData.java (66%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/WirelessGridExtendedMenuProvider.java (77%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/WirelessGridItem.java (68%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/WirelessGridOperations.java (90%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/screen/AbstractGridScreen.java (91%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/screen/AutoSelectedSideButtonWidget.java (69%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/screen/CraftingGridScreen.java (91%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/screen/GridScreen.java (72%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/screen/GridSearchBoxWidget.java (92%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/screen/LastModified.java (94%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/screen/ResourceTypeSideButtonWidget.java (80%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/screen/SortingDirectionSideButtonWidget.java (83%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/screen/SortingTypeSideButtonWidget.java (83%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/screen/SynchronizationSideButtonWidget.java (79%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/screen/hint/FluidGridInsertionHint.java (58%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/screen/hint/GridInsertionHintsImpl.java (84%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/screen/hint/ItemGridInsertionHint.java (63%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/screen/hint/SingleItemGridInsertionHint.java (66%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/hint/package-info.java create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/strategy/ClientGridExtractionStrategy.java (57%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/strategy/ClientGridInsertionStrategy.java (66%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/ClientGridScrollingStrategy.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/strategy/CompositeGridExtractionStrategy.java (77%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/strategy/CompositeGridInsertionStrategy.java (88%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/strategy/CompositeGridScrollingStrategy.java (69%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy}/package-info.java (77%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/view/AbstractFluidGridResourceFactory.java (92%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/view/AbstractItemGridResourceFactory.java (93%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/view/CompositeGridResourceFactory.java (77%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/view/FluidGridResource.java (77%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/grid/view/ItemGridResource.java (82%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/iface/ExportedResourcesContainer.java (87%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/iface/InterfaceBlock.java (76%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/iface/InterfaceBlockEntity.java (86%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/iface/InterfaceContainerMenu.java (79%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/iface/InterfaceData.java (78%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/iface/InterfacePlatformExternalStorageProviderFactory.java (83%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/iface/InterfaceProxyExternalStorageProvider.java (97%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/iface/InterfaceScreen.java (68%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/importer/ImporterBlock.java (73%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/importer/ImporterBlockEntity.java (82%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/importer/ImporterContainerMenu.java (69%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/importer/ImporterScreen.java (62%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/misc/ProcessorItem.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/misc/WrenchItem.java (70%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/misc/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/CableBlock.java (78%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/NetworkCardInventory.java (82%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/NetworkCardItem.java (86%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/NetworkCardItemPropertyFunction.java (84%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/NetworkReceiverBlock.java (74%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/NetworkReceiverBlockEntity.java (66%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/NetworkReceiverKey.java (94%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/NetworkTransmitterBlock.java (78%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/NetworkTransmitterBlockEntity.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/NetworkTransmitterBlockEntityTicker.java (76%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/NetworkTransmitterContainerMenu.java (80%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/NetworkTransmitterData.java (93%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/NetworkTransmitterScreen.java (75%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/NetworkTransmitterState.java (85%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/RelayBlock.java (65%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/RelayBlockEntity.java (88%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/RelayContainerMenu.java (85%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/RelayInputNetworkNodeContainer.java (84%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/RelayOutputNetworkNodeContainer.java (86%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/RelayPassEnergySideButtonWidget.java (69%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/RelayPassSecuritySideButtonWidget.java (69%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/RelayPassStorageSideButtonWidget.java (69%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/RelayPassThroughSideButtonWidget.java (69%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/RelayPropertyTypes.java (64%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/networking/RelayScreen.java (84%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/package-info.java create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/AbstractSecurityCardContainerMenu.java (89%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/AbstractSecurityCardExtendedMenuProvider.java (78%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/AbstractSecurityCardItem.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/AbstractSecurityCardScreen.java (94%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/BuiltinPermission.java (77%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/FallbackSecurityCardContainerMenu.java (77%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/FallbackSecurityCardExtendedMenuProvider.java (83%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/FallbackSecurityCardItem.java (76%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/FallbackSecurityCardScreen.java (88%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/PlatformSecurityNetworkComponentImpl.java (87%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/PlayerBoundSecurityCardData.java (96%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/PlayerSecurityActor.java (73%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/SecurityCardBoundPlayer.java (95%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/SecurityCardContainerMenu.java (85%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/SecurityCardData.java (72%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/SecurityCardExtendedMenuProvider.java (87%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/SecurityCardItem.java (88%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/SecurityCardItemPropertyFunction.java (84%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/SecurityCardPermissions.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/SecurityCardScreen.java (96%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/SecurityManagerBlock.java (63%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/SecurityManagerBlockEntity.java (87%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/SecurityManagerContainerMenu.java (69%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/security/SecurityManagerScreen.java (73%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/AbstractDiskContainerBlockEntity.java (89%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/AbstractProgressStorageScreen.java (92%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/AbstractStorageContainerMenu.java (84%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/AbstractStorageScreen.java (81%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/AccessModeSettings.java (92%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/AccessModeSideButtonWidget.java (88%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/BucketPlayerInventoryInsertableStorage.java (92%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/ClientStorageRepository.java (87%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/Disk.java (76%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/DiskContainerBlockEntityTicker.java (89%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/DiskInventory.java (92%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/DiskStateChangeListener.java (95%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/FilterModeSideButtonWidget.java (86%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/FluidStorageVariant.java (88%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/ItemStorageVariant.java (91%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/LimitedPlatformStorage.java (85%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/PlatformStorage.java (91%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/PrioritySideButtonWidget.java (79%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/SameTypeStorageType.java (93%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/StorageAccessor.java (68%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/StorageCodecs.java (97%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/StorageConfigurationContainer.java (82%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/StorageConfigurationContainerImpl.java (92%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/StorageContainerItemHelperImpl.java (92%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/StoragePropertyTypes.java (65%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/StorageRepositoryImpl.java (86%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/StorageTooltipHelper.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/StorageTypes.java (55%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/VoidExcessSideButtonWidget.java (74%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java (84%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/diskdrive/AbstractDiskDriveBlockEntityRenderer.java (86%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/diskdrive/DiskDriveBlock.java (70%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/diskdrive/DiskDriveContainerMenu.java (75%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/diskdrive/DiskDriveScreen.java (74%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/diskdrive/EmptyStorageDiskInfoAccessor.java (64%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/diskdrive/StorageDiskInfoAccessor.java (52%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/diskdrive/StorageDiskInfoAccessorImpl.java (67%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive}/package-info.java (76%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java (88%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/diskinterface/AbstractDiskInterfaceBlockEntityRenderer.java (86%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/diskinterface/DiskInterfaceBlock.java (69%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/diskinterface/DiskInterfaceContainerMenu.java (72%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/diskinterface/DiskInterfacePropertyTypes.java (61%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/diskinterface/DiskInterfaceScreen.java (77%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/diskinterface/TransferModeSettings.java (91%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/diskinterface/TransferModeSideButtonWidget.java (87%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/externalstorage/ExternalStorageBlock.java (78%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/externalstorage/ExternalStorageBlockEntity.java (85%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/externalstorage/ExternalStorageContainerMenu.java (67%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/externalstorage/ExternalStorageScreen.java (73%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/externalstorage/ExternalStorageTrackedStorageRepository.java (89%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/externalstorage/ExternalStorageWorkRate.java (91%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/package-info.java create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/portablegrid/AbstractPortableGridBlockEntity.java (84%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/portablegrid/AbstractPortableGridBlockEntityRenderer.java (87%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/portablegrid/AbstractPortableGridContainerMenu.java (74%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/portablegrid/InWorldPortableGrid.java (87%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/portablegrid/PortableGrid.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/portablegrid/PortableGridBlock.java (86%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/portablegrid/PortableGridBlockContainerMenu.java (69%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/portablegrid/PortableGridBlockEntityTicker.java (82%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/portablegrid/PortableGridBlockItem.java (88%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridBlockItemRenderInfo.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/portablegrid/PortableGridItemContainerMenu.java (74%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/portablegrid/PortableGridItemExtendedMenuProvider.java (75%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/portablegrid/PortableGridLootItemFunction.java (81%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/portablegrid/PortableGridOperations.java (92%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/portablegrid/PortableGridScreen.java (89%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/portablegrid/PortableGridStorage.java (91%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridType.java create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/storageblock/AbstractStorageBlock.java (81%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/storageblock/AbstractStorageBlockBlockEntity.java (84%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/storageblock/AbstractStorageBlockContainerMenu.java (74%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/storageblock/AbstractStorageBlockScreen.java (73%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/storageblock/FluidStorageBlock.java (64%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/storageblock/FluidStorageBlockBlockEntity.java (80%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/storageblock/FluidStorageBlockBlockItem.java (76%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/storageblock/FluidStorageBlockContainerMenu.java (74%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/storageblock/FluidStorageBlockScreen.java (76%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/storageblock/ItemStorageBlock.java (64%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/storageblock/ItemStorageBlockBlockEntity.java (79%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/storageblock/ItemStorageBlockBlockItem.java (77%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/storageblock/ItemStorageBlockContainerMenu.java (73%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/storageblock/ItemStorageBlockScreen.java (84%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/storageblock/StorageBlockData.java (78%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/storageblock/StorageBlockLootItemFunction.java (77%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/storagedisk/FluidStorageDiskItem.java (69%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storage/storagedisk/ItemStorageDiskItem.java (69%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storagedisk/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storagemonitor/CompositeStorageMonitorExtractionStrategy.java (86%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storagemonitor/CompositeStorageMonitorInsertionStrategy.java (85%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storagemonitor/FluidStorageMonitorExtractionStrategy.java (77%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java (85%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java (84%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storagemonitor/ItemStorageMonitorInsertionStrategy.java (85%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storagemonitor/StorageMonitorBlock.java (81%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storagemonitor/StorageMonitorBlockEntity.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storagemonitor/StorageMonitorBlockEntityRenderer.java (92%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storagemonitor/StorageMonitorContainerMenu.java (63%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storagemonitor/StorageMonitorInsertTracker.java (87%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/storagemonitor/StorageMonitorScreen.java (68%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor}/package-info.java (77%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/AbstractActiveColoredDirectionalBlock.java (96%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/AbstractBaseBlock.java (94%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/AbstractBaseContainerMenu.java (82%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/AbstractBaseScreen.java (89%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/AbstractBlockEntityTicker.java (93%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/AbstractColoredBlock.java (92%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/AbstractDirectionalBlock.java (95%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/AbstractDirectionalCableBlock.java (94%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/AbstractFilterScreen.java (74%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/AbstractPlatformSavedData.java (74%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/BaseBlockItem.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/BlockEntityWithDrops.java (74%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/BlockItemProvider.java (70%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/CableBlockSupport.java (96%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/CableShapeCacheKey.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/ColorableBlock.java (74%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/DirectionalCableBlockShapes.java (98%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/FilterModeSettings.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/FilterWithFuzzyMode.java (94%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/FilteredContainer.java (88%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/NetworkNodeBlockItem.java (88%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/PlayerAwareBlockEntity.java (62%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/RedstoneMode.java (87%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/RedstoneModeSettings.java (91%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/SchedulingMode.java (97%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/SchedulingModeType.java (94%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/SimpleBlock.java (54%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/SimpleItem.java (71%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/TextureIds.java (56%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/amount/AbstractAmountScreen.java (97%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/amount/AbstractSingleAmountScreen.java (88%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/amount/AmountOperations.java (83%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/amount/AmountScreenConfiguration.java (99%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/amount/DoubleAmountOperations.java (96%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/amount/IntegerAmountOperations.java (95%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/amount/LongAmountOperations.java (91%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/amount/PriorityScreen.java (83%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/amount/ResourceAmountScreen.java (82%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/importer => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount}/package-info.java (77%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/AbstractResourceContainerMenu.java (92%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/AbstractSchedulingContainerMenu.java (78%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/AbstractSimpleFilterContainerMenu.java (83%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/AbstractSingleAmountContainerMenu.java (85%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/ClientProperty.java (86%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/DisabledSlot.java (83%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/ExtendedMenuProvider.java (79%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/MenuOpener.java (70%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/NetworkNodeExtendedMenuProvider.java (59%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/NetworkNodeMenuProvider.java (53%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/Property.java (67%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/PropertyType.java (77%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/PropertyTypes.java (74%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/ResourceInventoryDestination.java (80%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/ResourceSlot.java (93%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/ResourceSlotType.java (51%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/ServerProperty.java (92%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/SingleAmountData.java (68%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/TransferDestination.java (71%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/TransferManager.java (97%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/containermenu/ValidatedSlot.java (86%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/direction/BiDirection.java (97%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/direction/BiDirectionType.java (95%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/direction/DefaultDirectionType.java (95%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/direction/DirectionType.java (85%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/direction/HorizontalDirection.java (83%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/direction/HorizontalDirectionType.java (96%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction}/package-info.java (76%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/energy/BlockEntityEnergyStorage.java (89%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/energy/CreativeEnergyStorage.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/energy/EnergyContainerMenu.java (57%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/energy/EnergyInfo.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/energy/EnergyItemHelperImpl.java (85%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/energy/EnergyLootItemFunction.java (80%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/energy/ItemBlockEnergyStorage.java (96%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/energy/ItemEnergyStorage.java (85%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java (96%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/network/AbstractRedstoneModeNetworkNodeContainerBlockEntity.java (87%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/network/AbstractSchedulingNetworkNodeContainerBlockEntity.java (81%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java (86%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/network/BaseNetworkNodeContainerBlockEntity.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/network/ConnectionProviderImpl.java (97%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/network/ConnectionSinkImpl.java (86%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/network/InWorldNetworkNodeContainerImpl.java (88%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/network/NetworkNodeBlockEntityTicker.java (89%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/network/bounditem/NetworkBoundItemHelperImpl.java (80%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java (76%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/network/bounditem/NetworkBoundItemSessionImpl.java (84%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/network/component/PlatformStorageNetworkComponent.java (72%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/component/package-info.java rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network}/package-info.java (76%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/PacketContext.java (64%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/PacketHandler.java (59%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/c2s/C2SPackets.java (84%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/c2s/CraftingGridClearPacket.java (76%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/c2s/CraftingGridRecipeTransferPacket.java (72%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/c2s/GridExtractPacket.java (67%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/c2s/GridInsertPacket.java (72%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/c2s/GridScrollPacket.java (63%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/c2s/PropertyChangePacket.java (77%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/c2s/ResourceFilterSlotChangePacket.java (71%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/c2s/ResourceSlotAmountChangePacket.java (77%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/c2s/ResourceSlotChangePacket.java (77%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/c2s/SecurityCardBoundPlayerPacket.java (80%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/c2s/SecurityCardPermissionPacket.java (72%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/c2s/SecurityCardResetPermissionPacket.java (70%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/c2s/SingleAmountChangePacket.java (75%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/c2s/StorageInfoRequestPacket.java (73%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/c2s/UseSlotReferencedItemPacket.java (71%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s}/package-info.java (76%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/s2c/EnergyInfoPacket.java (77%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/s2c/GridActivePacket.java (81%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/s2c/GridClearPacket.java (74%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/s2c/GridUpdatePacket.java (70%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/s2c/NetworkTransmitterStatusPacket.java (76%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/s2c/NoPermissionPacket.java (79%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/s2c/ResourceSlotUpdatePacket.java (75%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/s2c/S2CPackets.java (88%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/s2c/StorageInfoResponsePacket.java (80%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/packet/s2c/WirelessTransmitterRangePacket.java (75%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c}/package-info.java (76%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/registry/PlatformRegistryImpl.java (95%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/registry/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/render/AbstractDiskLedBlockEntityRenderer.java (89%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/render/AbstractFluidRenderer.java (98%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/render/CubeBuilder.java (98%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/render/FluidRenderer.java (76%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/render/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/resource/AbstractResourceContainerContainerAdapter.java (94%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/resource/CompositeRecipeModIngredientConverter.java (77%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/resource/FluidResource.java (77%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/resource/FluidResourceContainerInsertStrategy.java (82%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/resource/FluidResourceFactory.java (74%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/resource/FluidResourceRendering.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/resource/FluidResourceType.java (80%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/resource/ItemResource.java (84%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/resource/ItemResourceFactory.java (80%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/resource/ItemResourceRendering.java (93%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/resource/ItemResourceType.java (80%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/resource/ResourceCodecs.java (93%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/resource/ResourceContainerData.java (87%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/resource/ResourceContainerImpl.java (96%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/resource/ResourceContainerSlot.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/resource/ResourceTypes.java (57%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/resource/list/FuzzyResourceListImpl.java (90%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/list/package-info.java create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/slotreference/CompositeSlotReferenceProvider.java (83%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/slotreference/InventorySlotReference.java (81%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/slotreference/InventorySlotReferenceFactory.java (76%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/slotreference/InventorySlotReferenceProvider.java (75%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/slotreference/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/stretching/AbstractStretchingScreen.java (94%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/stretching/ScreenSize.java (82%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/stretching/ScreenSizeListener.java (59%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/stretching/ScreenSizeSideButtonWidget.java (86%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/stretching/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/tooltip/CompositeClientTooltipComponent.java (95%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/tooltip/HelpClientTooltipComponent.java (91%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/tooltip/MouseClientTooltipComponent.java (93%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/tooltip/ResourceClientTooltipComponent.java (89%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/tooltip/SmallText.java (93%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/tooltip/SmallTextClientTooltipComponent.java (93%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/widget/AbstractSideButtonWidget.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/widget/AbstractYesNoSideButtonWidget.java (71%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/widget/CustomCheckboxWidget.java (98%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/widget/FuzzyModeSideButtonWidget.java (89%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/widget/History.java (93%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/widget/HoveredImageButton.java (93%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/widget/ProgressWidget.java (91%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/widget/RedstoneModeSideButtonWidget.java (89%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/widget/SchedulingModeSideButtonWidget.java (82%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/widget/ScrollbarWidget.java (96%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/support/widget/SearchFieldWidget.java (94%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/upgrade/FortuneUpgradeItem.java (76%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/upgrade/RangeUpgradeItem.java (71%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/upgrade/RegulatorUpgradeContainerMenu.java (72%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/upgrade/RegulatorUpgradeItem.java (83%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/upgrade/RegulatorUpgradeScreen.java (74%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/upgrade/RegulatorUpgradeState.java (86%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/upgrade/SimpleUpgradeItem.java (80%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/upgrade/UpgradeContainer.java (90%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/upgrade/UpgradeDestinationClientTooltipComponent.java (93%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/upgrade/UpgradeDestinations.java (84%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/upgrade/UpgradeItemClientTooltipComponent.java (89%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/upgrade/UpgradeRegistryImpl.java (88%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/upgrade/UpgradeSlot.java (83%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/upgrade/UpgradeWithEnchantedBookRecipe.java (96%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/upgrade/UpgradeWithEnchantedBookRecipeSerializer.java (90%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/package-info.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/util/ContainerUtil.java (96%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/util/CustomBlockPlaceContext.java (92%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/util/IdentifierUtil.java (93%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/util/MathUtil.java (76%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/util/PacketUtil.java (87%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/util/SecurityToastUtil.java (79%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/util/ServerEventQueue.java (90%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/package-info.java create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/BaseWirelessTransmitterRangeModifier.java rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/wirelesstransmitter/CompositeWirelessTransmitterRangeModifier.java (76%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/wirelesstransmitter/CreativeRangeUpgradeWirelessTransmitterRangeModifier.java (57%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/wirelesstransmitter/RangeUpgradeWirelessTransmitterRangeModifier.java (55%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/wirelesstransmitter/WirelessTransmitterBlock.java (75%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java (80%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java (75%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/wirelesstransmitter/WirelessTransmitterData.java (85%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java (81%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage}/common/wirelesstransmitter/WirelessTransmitterScreen.java (72%) rename {refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller => refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter}/package-info.java (76%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/blockstates/1024b_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/blockstates/16k_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/blockstates/1k_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/blockstates/256b_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/blockstates/4096b_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/blockstates/4k_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/blockstates/64b_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/blockstates/64k_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/blockstates/creative_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/blockstates/creative_portable_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/blockstates/creative_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/blockstates/interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/blockstates/portable_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_copper_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_iron_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/icon.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/lang/de_de.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/lang/en_us.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/lang/es_es.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/lang/fr_fr.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/lang/hu_hu.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/lang/id_id.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/lang/it_it.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/lang/ja_jp.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/lang/ko_kr.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/lang/pl_pl.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/lang/pt_br.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/lang/ru_ru.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/lang/tr_tr.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/lang/zh_cn.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/lang/zh_tw.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/1024b_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/16k_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/1k_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/256b_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/4096b_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/4k_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/64b_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/64k_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/all_cutout.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/cable/core/base.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/cable/extension/base.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/constructor/active.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/constructor/inactive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/constructor_destructor/active.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/constructor_destructor/inactive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/controller/nearly.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/controller/nearly_off.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/controller/nearly_on.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/controller/off.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/creative_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/creative_portable_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/creative_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/cutout.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/destructor/active.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/destructor/inactive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/detector/powered.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/detector/unpowered.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/disk/disk.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/disk/fluid_disk.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/disk/led_full.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/disk/led_inactive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/disk/led_near_capacity.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/disk/led_normal.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/disk_drive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/disk_drive/base.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/emissive_all_cutout.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/emissive_cutout.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/emissive_north_cutout.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/interface_active.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/interface_inactive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/machine_casing.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/north_cutout.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/portable_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/portable_grid/active.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/portable_grid/base.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/portable_grid/inactive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_copper_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_iron_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/storage_monitor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter/active.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter/inactive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_disk.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_part.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/16k_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/1k_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_disk.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_part.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_disk.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_part.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/4k_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_disk.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_part.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/64k_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/basic_processor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/book.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/cable/base.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/configuration_card.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/configuration_card/active.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/configuration_card/inactive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/construction_core.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/constructor/base.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_disk.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/creative_portable_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/creative_range_upgrade.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/creative_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/creative_wireless_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/destruction_core.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/destructor/base.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/disk_drive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/exporter/base.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/external_storage/base.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/fallback_security_card.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/fortune_1_upgrade.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/fortune_2_upgrade.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/fortune_3_upgrade.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/importer/base.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/improved_processor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/machine_casing.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/network_card.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/network_card/active.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/network_card/inactive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/portable_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/processor_binding.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/range_upgrade.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/raw_advanced_processor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/raw_basic_processor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/raw_improved_processor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/regulator_upgrade.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/security_card.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/security_card/active.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/security_card/inactive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/silicon.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/silk_touch_upgrade.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/speed_upgrade.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/stack_upgrade.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/storage_housing.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/storage_monitor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/upgrade.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/wireless_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/wireless_grid/active.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/wireless_grid/inactive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/models/item/wrench.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/sounds.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/sounds/wrench.ogg (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/bottom.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/cable/black.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/cable/blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/cable/brown.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/cable/cyan.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/cable/gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/cable/green.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/cable/light_blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/cable/light_gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/cable/lime.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/cable/magenta.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/cable/orange.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/cable/part_border.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/cable/pink.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/cable/purple.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/cable/red.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/cable/white.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/cable/yellow.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/active.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/active.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/constructor/front.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/black.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/black.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/blue.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/brown.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/brown.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/cyan.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/cyan.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/gray.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/green.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/green.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_blue.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_gray.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/lime.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/lime.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/magenta.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/magenta.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off_gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off_gray.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on_gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on_gray.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/off.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/on.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/orange.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/orange.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/pink.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/pink.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/purple.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/purple.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/red.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/red.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/white.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/white.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/yellow.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/yellow.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/off.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/controller/on.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/back.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/black.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/brown.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/cyan.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/green.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/light_blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/light_gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/lime.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/magenta.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/orange.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/pink.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/purple.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/red.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/white.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/yellow.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/front.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/left.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/right.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/top.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/active.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/active.png.mcmeta (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/destructor/front.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/detector/bottom.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/black.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/brown.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/cyan.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/green.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/light_blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/light_gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/lime.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/magenta.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/orange.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/pink.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/purple.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/red.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/unpowered.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/white.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/yellow.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/detector/side.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/detector/top.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk/disk.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk/fluid_disk.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk/leds.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_drive/bottom.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_drive/front.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_drive/side.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_drive/top.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/back.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/black.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/brown.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/cyan.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/green.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/light_blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/light_gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/lime.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/magenta.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/orange.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/pink.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/purple.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/red.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/white.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/yellow.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/front.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/left.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/right.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/disk_interface/top.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/1024b_fluid_storage_block.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/256b_fluid_storage_block.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/4096b_fluid_storage_block.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/64b_fluid_storage_block.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/creative_fluid_storage_block.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/back.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/black.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/brown.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/cyan.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/green.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/light_blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/light_gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/lime.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/magenta.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/orange.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/pink.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/purple.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/red.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/white.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/yellow.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/front.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/left.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/right.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/grid/top.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/interface/active.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/interface/inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/machine_casing.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_receiver/base.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/black.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/brown.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/cyan.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/green.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/light_blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/light_gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/lime.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/magenta.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/orange.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/pink.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/purple.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/red.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/white.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/yellow.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/base.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/black.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/brown.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/cyan.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/error.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/green.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/light_blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/light_gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/lime.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/magenta.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/orange.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/pink.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/purple.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/red.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/white.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/yellow.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_1.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_2.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_2_inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_3.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_4.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_5.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_6.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_7.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_8.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/quartz_enriched_copper_block.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/quartz_enriched_iron_block.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/.gitignore (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/black.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/brown.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/cyan.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/green.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/light_blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/light_gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/lime.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/magenta.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/orange.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/pink.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/purple.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/red.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/white.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/yellow.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/black.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/brown.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/cyan.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/green.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/light_blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/light_gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/lime.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/magenta.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/orange.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/pink.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/purple.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/red.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/white.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/yellow.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/in.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/relay/out.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/back.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/black.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/brown.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/cyan.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/green.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/light_blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/light_gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/lime.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/magenta.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/orange.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/pink.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/purple.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/red.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/white.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/yellow.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/black.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/brown.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/cyan.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/green.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/light_blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/light_gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/lime.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/magenta.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/orange.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/pink.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/purple.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/red.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/white.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/yellow.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/black.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/brown.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/cyan.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/green.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/light_blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/light_gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/lime.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/magenta.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/orange.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/pink.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/purple.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/red.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/white.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/yellow.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/black.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/brown.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/cyan.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/green.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/light_blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/light_gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/lime.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/magenta.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/orange.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/pink.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/purple.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/red.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/white.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/yellow.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/black.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/brown.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/cyan.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/green.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/light_blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/light_gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/lime.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/magenta.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/orange.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/pink.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/purple.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/red.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/white.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/yellow.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/front.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/left.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/right.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/security_manager/top.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/side.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/storage_block/16k_storage_block.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/storage_block/1k_storage_block.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/storage_block/4k_storage_block.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/storage_block/64k_storage_block.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/storage_block/creative_storage_block.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/back.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/front.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/left.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/right.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/top.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/base.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/black.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/brown.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/cyan.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/green.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/light_blue.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/light_gray.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/lime.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/magenta.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/orange.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/pink.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/purple.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/red.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/white.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/yellow.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/advancements.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/amount_with_inventory.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/book.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/controller.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/crafting.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/crafting_grid.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/disk_drive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/disk_interface.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/generic_filter.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/grid.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/interface.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/network_transmitter.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/portable_grid.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/priority.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/resource_amount.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/security_card.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/security_manager.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down_disabled.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down_focused.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up_disabled.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up_focused.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/storage.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/storage_monitor.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/widgets.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/icons.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/1024b_fluid_storage_disk.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/1024b_fluid_storage_part.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/16k_storage_disk.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/16k_storage_part.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/1k_storage_disk.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/1k_storage_part.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/256b_fluid_storage_disk.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/256b_fluid_storage_part.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/4096b_fluid_storage_disk.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/4096b_fluid_storage_part.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/4k_storage_disk.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/4k_storage_part.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/64b_fluid_storage_disk.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/64b_fluid_storage_part.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/64k_storage_disk.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/64k_storage_part.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/advanced_processor.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/basic_processor.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/book.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/configuration_card/active.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/configuration_card/inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/construction_core.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/creative_fluid_storage_disk.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/creative_range_upgrade.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/creative_storage_disk.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/destruction_core.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/fortune_upgrade.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/improved_processor.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/network_card/active.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/network_card/inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/processor_binding.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/quartz_enriched_copper.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/quartz_enriched_iron.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/range_upgrade.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/raw_advanced_processor.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/raw_basic_processor.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/raw_improved_processor.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/regulator_upgrade.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/security_card/active.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/security_card/fallback.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/security_card/inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/silicon.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/silk_touch_upgrade.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/speed_upgrade.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/stack_upgrade.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/storage_housing.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/upgrade.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/wireless_grid/active.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/wireless_grid/inactive.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/assets/refinedstorage/textures/item/wrench.png (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/c/tags/item/tools/wrench.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/better_than_a_barrel.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/conditional_connecting.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/connecting.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/construction.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/destruction.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/detecting.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/drives.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/exporting.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/importing.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/interface_to_the_world.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/interfacing_with_disks.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/no_cables_required.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/portable_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/root.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/security.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/storing_externally.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/storing_fluids.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/storing_items.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/upgrading.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/upgrading_your_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/viewing_your_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/advancement/wireless.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/loot_table/blocks/1024b_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/loot_table/blocks/16k_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/loot_table/blocks/1k_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/loot_table/blocks/256b_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/loot_table/blocks/4096b_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/loot_table/blocks/4k_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/loot_table/blocks/64b_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/loot_table/blocks/64k_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/loot_table/blocks/creative_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/loot_table/blocks/creative_portable_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/loot_table/blocks/creative_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/loot_table/blocks/disk_drive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/loot_table/blocks/exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/loot_table/blocks/external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/loot_table/blocks/importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/loot_table/blocks/interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/loot_table/blocks/machine_casing.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/loot_table/blocks/portable_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/loot_table/blocks/quartz_enriched_iron_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/loot_table/blocks/storage_monitor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_disk.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_disk_from_storage_housing.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_part.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/16k_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/16k_storage_disk.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/16k_storage_disk_from_storage_housing.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/16k_storage_part.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/1k_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/1k_storage_disk.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/1k_storage_disk_from_storage_housing.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/1k_storage_part.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_disk.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_disk_from_storage_housing.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_part.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_disk.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_disk_from_storage_housing.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_part.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/4k_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/4k_storage_disk.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/4k_storage_disk_from_storage_housing.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/4k_storage_part.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_disk.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_disk_from_storage_housing.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_part.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/64k_storage_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/64k_storage_disk.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/64k_storage_disk_from_storage_housing.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/64k_storage_part.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/advanced_processor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/basic_processor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/cable.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/configuration_card.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/construction_core.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/constructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/controller.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/crafting_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/destruction_core.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/destructor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/detector.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/disk_drive.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/disk_interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/exporter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/external_storage.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/fallback_security_card.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/fortune_1_upgrade.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/fortune_2_upgrade.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/fortune_3_upgrade.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/importer.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/improved_processor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/interface.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/machine_casing.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/network_card.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/network_receiver.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/network_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/portable_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/processor_binding.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper_from_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron_from_block.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/range_upgrade.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/raw_advanced_processor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/raw_basic_processor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/raw_improved_processor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/regulator_upgrade.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/relay.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/security_card.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/security_manager.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/silicon.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/silk_touch_upgrade.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/speed_upgrade.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/stack_upgrade.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/storage_housing.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/storage_monitor.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/upgrade.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/wireless_grid.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/wireless_transmitter.json (100%) rename {refinedstorage-platform-common => refinedstorage-common}/src/main/resources/data/refinedstorage/recipe/wrench.json (100%) rename {refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/test/java/com/refinedmods/refinedstorage}/common/SetupMinecraft.java (88%) rename {refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/test/java/com/refinedmods/refinedstorage}/common/TestPlatform.java (91%) rename {refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/test/java/com/refinedmods/refinedstorage}/common/grid/GridSortingTypesTest.java (94%) rename {refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/test/java/com/refinedmods/refinedstorage}/common/grid/screen/LastModifiedTest.java (98%) rename {refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/test/java/com/refinedmods/refinedstorage}/common/storage/ClientStorageRepositoryTest.java (91%) rename {refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/test/java/com/refinedmods/refinedstorage}/common/support/registry/PlatformRegistryImplTest.java (92%) rename {refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/test/java/com/refinedmods/refinedstorage}/common/support/resource/FluidResourceRenderingTest.java (89%) rename {refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/test/java/com/refinedmods/refinedstorage}/common/support/resource/list/FuzzyResourceListImplTest.java (93%) rename {refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform => refinedstorage-common/src/test/java/com/refinedmods/refinedstorage}/common/support/widget/HistoryTest.java (97%) rename {refinedstorage-platform-fabric => refinedstorage-fabric}/build.gradle.kts (85%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/ClientModInitializerImpl.java (83%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/ConfigImpl.java (97%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/ModInitializerImpl.java (77%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/PlatformImpl.java (90%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java (82%) create mode 100644 refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/exporter/package-info.java rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/grid/strategy/FluidGridExtractionStrategy.java (89%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/grid/strategy/FluidGridInsertionStrategy.java (88%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/grid/strategy/ItemGridExtractionStrategy.java (81%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/grid/strategy/ItemGridInsertionStrategy.java (85%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/grid/strategy/ItemGridScrollingStrategy.java (85%) create mode 100644 refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/package-info.java rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/grid/view/FabricFluidGridResourceFactory.java (77%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/grid/view/FabricItemGridResourceFactory.java (82%) create mode 100644 refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/view/package-info.java rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/importer/FabricStorageImporterSource.java (90%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/importer/FabricStorageImporterTransferStrategyFactory.java (86%) create mode 100644 refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/package-info.java rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/mixin/AbstractModelBakerImplMixin.java (86%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/mixin/EditBoxAccessor.java (81%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/mixin/ItemPropertiesAccessor.java (89%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/mixin/KeyMappingAccessor.java (83%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/mixin/ModelBakeryAccessor.java (86%) create mode 100644 refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/mixin/package-info.java rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/modmenu/ModMenuApiImpl.java (78%) create mode 100644 refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/modmenu/package-info.java create mode 100644 refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/package-info.java rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/security/NetworkNodeBreakSecurityEventListener.java (79%) create mode 100644 refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/security/package-info.java rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/storage/AbstractDiskContainerBakedModel.java (94%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/storage/FabricStorageExtractableStorage.java (95%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/storage/FabricStorageInsertableStorage.java (95%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/storage/FabricStorageUtil.java (90%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/storage/diskdrive/DiskDriveBakedModel.java (83%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java (57%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/storage/diskdrive/DiskDriveUnbakedModel.java (89%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/storage/diskdrive/FabricDiskDriveBlockEntity.java (70%) create mode 100644 refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskdrive/package-info.java rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/storage/diskinterface/DiskInterfaceBakedModel.java (82%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java (57%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java (91%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/storage/diskinterface/FabricDiskInterfaceBlockEntity.java (69%) create mode 100644 refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskinterface/package-info.java rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/storage/externalstorage/FabricStorageExternalStorageProvider.java (90%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/storage/externalstorage/FabricStoragePlatformExternalStorageProviderFactory.java (89%) create mode 100644 refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/externalstorage/package-info.java create mode 100644 refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/package-info.java rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/storage/portablegrid/DiskLeds.java (87%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/storage/portablegrid/FabricPortableGridBlockEntity.java (62%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/storage/portablegrid/PortableGridBakedModel.java (87%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/storage/portablegrid/PortableGridBlockEntityRendererImpl.java (58%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/storage/portablegrid/PortableGridUnbakedModel.java (91%) create mode 100644 refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/package-info.java rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/support/containermenu/ContainerTransferDestination.java (85%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/support/containermenu/MenuOpenerImpl.java (85%) create mode 100644 refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/containermenu/package-info.java rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/support/energy/EnergyStorageAdapter.java (96%) create mode 100644 refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/energy/package-info.java rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/support/render/EmissiveBakedModel.java (96%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/support/render/EmissiveModelRegistry.java (95%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/support/render/EmissiveTransform.java (96%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/support/render/FluidVariantFluidRenderer.java (88%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/support/render/QuadRotator.java (92%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/support/render/QuadRotators.java (74%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/support/render/QuadTranslator.java (91%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/support/render/RenderTypes.java (91%) create mode 100644 refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/package-info.java rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/support/resource/ResourceContainerFluidStorageAdapter.java (89%) rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/support/resource/VariantUtil.java (78%) create mode 100644 refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/resource/package-info.java rename {refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage}/fabric/util/SimpleSingleStackStorage.java (91%) create mode 100644 refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/util/package-info.java rename {refinedstorage-platform-fabric => refinedstorage-fabric}/src/main/resources/fabric.mod.json (83%) rename {refinedstorage-platform-fabric => refinedstorage-fabric}/src/main/resources/refinedstorage.accesswidener (100%) create mode 100644 refinedstorage-fabric/src/main/resources/refinedstorage.mixins.json rename {refinedstorage-platform-neoforge => refinedstorage-neoforge}/build.gradle.kts (73%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/ClientModInitializer.java (75%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/ConfigImpl.java (98%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/ModInitializer.java (78%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/PlatformImpl.java (89%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/datagen/BlockModelProviderImpl.java (97%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/datagen/BlockStateProviderImpl.java (92%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/datagen/DataGenerators.java (87%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/datagen/ItemModelProviderImpl.java (87%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/datagen/loot/BlockDropProvider.java (92%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/datagen/loot/LootTableProviderImpl.java (90%) create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/loot/package-info.java create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/package-info.java rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/datagen/recipe/RecoloringRecipeProvider.java (95%) create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/recipe/package-info.java rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/datagen/tag/BlockTagsProvider.java (85%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/datagen/tag/ItemTagsProviderImpl.java (69%) create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/tag/package-info.java rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/exporter/FluidHandlerExporterTransferStrategyFactory.java (64%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/exporter/ItemHandlerExporterTransferStrategyFactory.java (67%) create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/package-info.java rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/grid/strategy/CursorItemHandler.java (97%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/grid/strategy/FluidGridExtractionStrategy.java (88%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/grid/strategy/FluidGridInsertionStrategy.java (78%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/grid/strategy/ItemGridExtractionStrategy.java (70%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/grid/strategy/ItemGridInsertionStrategy.java (77%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/grid/strategy/ItemGridScrollingStrategy.java (77%) create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/package-info.java rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/grid/view/ForgeFluidGridResourceFactory.java (67%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/grid/view/ForgeItemGridResourceFactory.java (78%) create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/view/package-info.java rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/importer/FluidHandlerImporterSource.java (79%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/importer/FluidHandlerImporterTransferStrategyFactory.java (74%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/importer/ItemHandlerImporterSource.java (79%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/importer/ItemHandlerImporterTransferStrategyFactory.java (72%) create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/package-info.java create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/package-info.java rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/CapabilityCache.java (94%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/CapabilityCacheImpl.java (95%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/DiskContainerItemOverrides.java (92%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/FluidHandlerExtractableStorage.java (77%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/FluidHandlerInsertableStorage.java (80%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/ForgeHandlerUtil.java (81%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/ItemHandlerExtractableStorage.java (91%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/ItemHandlerInsertableStorage.java (90%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/diskdrive/DiskDriveBakedModel.java (90%) create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/diskdrive/DiskDriveGeometryLoader.java (86%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/diskdrive/DiskDriveUnbakedGeometry.java (84%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/diskdrive/ForgeDiskDriveBlockEntity.java (77%) create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/package-info.java rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/diskinterface/DiskInterfaceBakedModel.java (89%) create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/diskinterface/DiskInterfaceGeometryLoader.java (89%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java (86%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/diskinterface/ForgeDiskInterfaceBlockEntity.java (76%) create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/package-info.java rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/externalstorage/FluidHandlerExternalStorageProvider.java (78%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/externalstorage/FluidHandlerPlatformExternalStorageProviderFactory.java (71%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/externalstorage/ItemHandlerExternalStorageProvider.java (78%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/externalstorage/ItemHandlerPlatformExternalStorageProviderFactory.java (71%) create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/package-info.java create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/package-info.java rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/portablegrid/DiskLedBakers.java (76%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/portablegrid/ForgePortableGridBlockEntity.java (71%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/portablegrid/PortableGridBakedModel.java (86%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/portablegrid/PortableGridBlockEntityRendererImpl.java (50%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/portablegrid/PortableGridGeometryLoader.java (86%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/storage/portablegrid/PortableGridUnbakedGeometry.java (88%) create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/package-info.java rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/support/containermenu/ContainerTransferDestination.java (74%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/support/containermenu/MenuOpenerImpl.java (75%) create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/containermenu/package-info.java rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/support/energy/EnergyStorageAdapter.java (93%) create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/energy/package-info.java rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/support/inventory/InsertExtractItemHandler.java (96%) rename {refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/inventory}/package-info.java (76%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/support/render/DiskModelBaker.java (89%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/support/render/FluidStackFluidRenderer.java (92%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/support/render/ItemBakedModel.java (96%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/support/render/RenderTypes.java (90%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/support/render/RotationTranslationModelBaker.java (96%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/support/render/TransformationBuilder.java (86%) create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/package-info.java rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/support/resource/ResourceContainerFluidHandlerAdapter.java (81%) rename {refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage}/neoforge/support/resource/VariantUtil.java (91%) create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/resource/package-info.java rename {refinedstorage-platform-neoforge => refinedstorage-neoforge}/src/main/resources/META-INF/accesstransformer.cfg (100%) rename {refinedstorage-platform-neoforge => refinedstorage-neoforge}/src/main/resources/META-INF/neoforge.mods.toml (84%) rename {refinedstorage-platform-neoforge => refinedstorage-neoforge}/src/main/resources/icon.png (100%) rename {refinedstorage-platform-neoforge => refinedstorage-neoforge}/src/main/resources/pack.mcmeta (100%) rename {refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage}/common/GameTestUtil.java (93%) rename {refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage}/common/constructordestructor/ConstructorTest.java (82%) rename {refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage}/common/constructordestructor/ConstructorTestPlots.java (75%) rename {refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage}/common/constructordestructor/DestructorTest.java (87%) rename {refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage}/common/constructordestructor/DestructorTestPlots.java (75%) rename {refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage}/common/exporter/ExporterTest.java (84%) rename {refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage}/common/exporter/ExporterTestPlots.java (77%) rename {refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage}/common/importer/ImporterTest.java (91%) rename {refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform => refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage}/common/importer/ImporterTestPlots.java (81%) rename {refinedstorage-platform-neoforge => refinedstorage-neoforge}/src/test/resources/data/refinedstorage/structure/empty_15x15.nbt (100%) delete mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/package-info.java delete mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/channel/package-info.java delete mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/externalstorage/package-info.java delete mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/package-info.java delete mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/package-info.java delete mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/package-info.java delete mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/package-info.java delete mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/registry/package-info.java delete mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/list/package-info.java delete mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/package-info.java delete mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/slotreference/package-info.java delete mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/package-info.java delete mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerType.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridScrollingStrategy.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockItemRenderInfo.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridType.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/CableShapeCacheKey.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/component/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/registry/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/slotreference/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/package-info.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/BaseWirelessTransmitterRangeModifier.java delete mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/package-info.java delete mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/exporter/package-info.java delete mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/package-info.java delete mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/package-info.java delete mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/package-info.java delete mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/modmenu/package-info.java delete mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/security/package-info.java delete mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/package-info.java delete mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/package-info.java delete mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/externalstorage/package-info.java delete mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/package-info.java delete mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/package-info.java delete mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/package-info.java delete mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/energy/package-info.java delete mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/package-info.java delete mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/package-info.java delete mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/util/package-info.java delete mode 100644 refinedstorage-platform-fabric/src/main/resources/refinedstorage.mixins.json delete mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/loot/package-info.java delete mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/recipe/package-info.java delete mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/package-info.java delete mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/package-info.java delete mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/package-info.java delete mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/package-info.java delete mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/package-info.java delete mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/package-info.java delete mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java delete mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/package-info.java delete mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java delete mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/package-info.java delete mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/package-info.java delete mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/package-info.java delete mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/package-info.java delete mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/energy/package-info.java delete mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/inventory/package-info.java delete mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/package-info.java delete mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/package-info.java diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e8fb13b30..18b4d735d 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -141,7 +141,7 @@ easily set up networks for testing. ### Integration testing To test the entire chain from Minecraft to the API modules, we use integration tests. These tests are located in the -test source set of the `refinedstorage-platform-neoforge` module. +test source set of the `refinedstorage-neoforge` module. We write these integration tests as Minecraft gametests. @@ -151,8 +151,8 @@ Our [SonarQube quality gate](https://sonarcloud.io/organizations/refinedmods/qua test coverage percentage of 80%. This an aggregated percentage over all the API modules, with an exclusion for the platform modules. -> The `refinedstorage-platform-*` modules are excluded because they contain a lot of Minecraft-specific code and are -> harder to test. +> The `refinedstorage-neoforge` and `refinedstorage-fabric` modules are excluded because they contain a lot of +> Minecraft-specific code and are harder to test. ### Mutation testing @@ -261,22 +261,21 @@ The workflow takes care of the following: ## Modules -Refined Storage is split up into various modules. - -Most modules aren't dependent on Minecraft or a mod loader. Only modules that start -with `refinedstorage-platform-*` have dependencies on Minecraft. - -| Name | Use in addons | Description | -|----------------------------------|---------------|----------------------------------------------------------------------------------------------------| -| `refinedstorage-core-api` | ✔️ | Contains some utility classes and enums. | -| `refinedstorage-grid-api` | ✔️ | Contains Grid related functionality. | -| `refinedstorage-network-api` | ✔️ | Contains storage network related functionality. | -| `refinedstorage-network` | ❌ | Contains implementations of `refinedstorage-network-api`. | -| `refinedstorage-network-test` | ✔️ | JUnit extension which helps with setting up a network and a network node for testing. | -| `refinedstorage-query-parser` | ✔️ | A query parser, contains a lexer and parser. Only used for Grid query parsing. | -| `refinedstorage-resource-api` | ✔️ | Contains API for handling resources. | -| `refinedstorage-storage-api` | ✔️ | Contains storage related functionality. | -| `refinedstorage-platform-api` | ✔️ | Implements the various Refined Storage API modules for use in Minecraft. | -| `refinedstorage-platform-fabric` | ❌ | The platform module for Fabric. This module contains Fabric specific code. | -| `refinedstorage-platform-forge` | ❌ | The platform module for Forge. This module contains Forge specific code and the integration tests. | -| `refinedstorage-platform-common` | ❌ | Common mod code. Most gameplay code is in here. | +Refined Storage is split up into various modules. Most modules aren't dependent on Minecraft or a mod loader. Only +the `refinedstorage-common`, `refinedstorage-neoforge` and `refinedstorage-fabric` modules have dependencies on +Minecraft. + +| Name | Use in addons | Description | +|-------------------------------|---------------|----------------------------------------------------------------------------------------------------| +| `refinedstorage-core-api` | ✔️ | Contains some utility classes and enums. | +| `refinedstorage-grid-api` | ✔️ | Contains Grid related functionality. | +| `refinedstorage-network-api` | ✔️ | Contains storage network related functionality. | +| `refinedstorage-network` | ❌ | Contains implementations of `refinedstorage-network-api`. | +| `refinedstorage-network-test` | ✔️ | JUnit extension which helps with setting up a network and a network node for testing. | +| `refinedstorage-query-parser` | ✔️ | A query parser, contains a lexer and parser. Only used for Grid query parsing. | +| `refinedstorage-resource-api` | ✔️ | Contains API for handling resources. | +| `refinedstorage-storage-api` | ✔️ | Contains storage related functionality. | +| `refinedstorage-common-api` | ✔️ | Implements the various Refined Storage API modules for use in Minecraft. | +| `refinedstorage-common` | ❌ | Common mod code. Most gameplay code is in here. | +| `refinedstorage-fabric` | ❌ | The platform module for Fabric. This module contains Fabric specific code. | +| `refinedstorage-neoforge` | ❌ | The platform module for Forge. This module contains Forge specific code and the integration tests. | diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 427564528..5e6efeec0 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,6 +1,6 @@ #file: noinspection YAMLSchemaValidation,YAMLSchemaValidation blank_issues_enabled: true contact_links: - - name: Discord Community Support - url: https://discordapp.com/invite/VYzsydb - about: Please ask and answer questions here. Issues should be used for bugs and feature requests. + - name: Discord Community Support + url: https://discordapp.com/invite/VYzsydb + about: Please ask and answer questions here. Issues should be used for bugs and feature requests. diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml index 5509c3a70..66e157484 100644 --- a/.github/ISSUE_TEMPLATE/enhancement.yml +++ b/.github/ISSUE_TEMPLATE/enhancement.yml @@ -2,22 +2,22 @@ name: Enhancement description: Do you have a suggestion for a new feature or improvement? Let us know. labels: [ enhancement ] body: - - type: markdown - attributes: - value: | - Provide a summary of the enhancement in the title above. - - Please follow following guidelines before proposing an enchancement: - 1) Ensure that you are running on the latest version (to ensure that the enhancement does not exist yet). - 2) Ensure that your enhancement hasn't already been posted. Please look in the closed issues as well (for enhancements that have been denied). - - We might close your issue, without explanation, if you do not follow these guidelines. - - type: textarea - id: describe - attributes: - label: Describe your enhancement - description: | - Be as detailed as possible. - Tell us how your idea should work. Why should we consider this? - validations: - required: true + - type: markdown + attributes: + value: | + Provide a summary of the enhancement in the title above. + + Please follow following guidelines before proposing an enchancement: + 1) Ensure that you are running on the latest version (to ensure that the enhancement does not exist yet). + 2) Ensure that your enhancement hasn't already been posted. Please look in the closed issues as well (for enhancements that have been denied). + + We might close your issue, without explanation, if you do not follow these guidelines. + - type: textarea + id: describe + attributes: + label: Describe your enhancement + description: | + Be as detailed as possible. + Tell us how your idea should work. Why should we consider this? + validations: + required: true diff --git a/CHANGELOG.md b/CHANGELOG.md index c104852a1..6398cd1ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,14 +9,14 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Added -- Ability to extract fluids from the Interface using an empty bucket or other empty fluid container. -- Support for the NeoForge config screen. +- Ability to extract fluids from the Interface using an empty bucket or other empty fluid container. +- Support for the NeoForge config screen. ### Fixed -- Fixed crash when trying to export fluids into an Interface on Fabric. -- Fixed Relay configuration not being correct on NeoForge. -- Fixed crash in logs when trying to quick craft an empty result slot in the Crafting Grid. +- Fixed crash when trying to export fluids into an Interface on Fabric. +- Fixed Relay configuration not being correct on NeoForge. +- Fixed crash in logs when trying to quick craft an empty result slot in the Crafting Grid. ## [2.0.0-milestone.4.4] - 2024-07-10 @@ -24,16 +24,17 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Added -- Ability to open Portable Grid with a keybinding. +- Ability to open Portable Grid with a keybinding. ### Fixed -- Fixed Relay model not being able to load correctly. -- Fixed not being able to ghost drag resources from recipe viewers into filter slots on NeoForge. -- Fixed extra dark backgrounds due to drawing background on GUIs twice. -- Fixed Configuration Card not being able to transfer upgrades for the Wireless Transmitter. -- Fixed upgrade inventories not maintaining order after reloading. Upgrade inventories from the milestone 4.2 are incompatible and will be empty. -- Fixed Wireless Transmitter not dropping upgrades when breaking block. +- Fixed Relay model not being able to load correctly. +- Fixed not being able to ghost drag resources from recipe viewers into filter slots on NeoForge. +- Fixed extra dark backgrounds due to drawing background on GUIs twice. +- Fixed Configuration Card not being able to transfer upgrades for the Wireless Transmitter. +- Fixed upgrade inventories not maintaining order after reloading. Upgrade inventories from the milestone 4.2 are + incompatible and will be empty. +- Fixed Wireless Transmitter not dropping upgrades when breaking block. ## [2.0.0-milestone.4.2] - 2024-07-06 @@ -41,40 +42,41 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Fixed -- Fixed creative mode tab icon on NeoForge showing a durability bar. +- Fixed creative mode tab icon on NeoForge showing a durability bar. ## [2.0.0-milestone.4.0] - 2024-07-04 ### Added -- Ported to Minecraft 1.21. -- More help information for items. -- Quartz Enriched Copper, used to craft cables. -- Block of Quartz Enriched Copper +- Ported to Minecraft 1.21. +- More help information for items. +- Quartz Enriched Copper, used to craft cables. +- Block of Quartz Enriched Copper ### Changed -- The mod ID has been changed from "refinedstorage2" to "refinedstorage". Worlds that used milestone 3 on Minecraft 1.20.4 are no longer compatible. -- Recipes now use common tag conventions from NeoForge and Fabric. +- The mod ID has been changed from "refinedstorage2" to "refinedstorage". Worlds that used milestone 3 on Minecraft + 1.20.4 are no longer compatible. +- Recipes now use common tag conventions from NeoForge and Fabric. ### Fixed -- Regulator Upgrade having wrong GUI title. -- Crafting Grid not dropping crafting matrix contents when broken. -- "+1" button on amount screen not doing anything. +- Regulator Upgrade having wrong GUI title. +- Crafting Grid not dropping crafting matrix contents when broken. +- "+1" button on amount screen not doing anything. ## [2.0.0-milestone.3.14] - 2024-06-28 ### Added -- Disk Interface (formerly known as the "Disk Manipulator"). -- Item tag translations. +- Disk Interface (formerly known as the "Disk Manipulator"). +- Item tag translations. ### Fixed -- Relay having no help tooltip. -- Fixed bug where adding more Speed Upgrades would actually slow down the device even more. -- Fixed missing textures for scheduling mode side button. +- Relay having no help tooltip. +- Fixed bug where adding more Speed Upgrades would actually slow down the device even more. +- Fixed missing textures for scheduling mode side button. ## [2.0.0-milestone.3.13] - 2024-06-16 @@ -82,13 +84,13 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Removed -- The Trinkets integration has been removed and will be moved to an addon mod. +- The Trinkets integration has been removed and will be moved to an addon mod. ## [2.0.0-milestone.3.11] - 2024-06-16 ### Removed -- The Curios integration has been removed and will be moved to an addon mod. +- The Curios integration has been removed and will be moved to an addon mod. ## [2.0.0-milestone.3.10] - 2024-06-16 @@ -96,584 +98,595 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Fixed -- Side button tooltip rendering issue with ModernUI. +- Side button tooltip rendering issue with ModernUI. ## [2.0.0-milestone.3.8] - 2024-06-08 ### Removed -- The REI integration has been removed and will be moved to an addon mod. +- The REI integration has been removed and will be moved to an addon mod. ## [2.0.0-milestone.3.7] - 2024-06-03 ### Removed -- The JEI integration has been removed and will be moved to an addon mod. +- The JEI integration has been removed and will be moved to an addon mod. ## [2.0.0-milestone.3.6] - 2024-05-18 ### Added -- Relay +- Relay ### Changed -- The Detector, Network Receiver, Network Transmitter and Security Manager will now always connect regardless of color. -- The Relay now has a "pass-through" mode. By default, pass-through is on, which means that when the Relay is active, the network signal from the input network will be passed through as-is to the output side. -- When the "pass-through" mode on the Relay is off, the network signal from the input network will no longer be passed through as-is to the output side, but you can choose to pass the energy buffer, security settings or (specific) storage resources of the input network to the output network. -- When using the Relay when "pass-through" mode is off, and when passing all storage resources or specific storage resources, you can choose the filter mode, whether fuzzy mode is enabled, the access mode and the priority of the storage exposed to the output network. +- The Detector, Network Receiver, Network Transmitter and Security Manager will now always connect regardless of color. +- The Relay now has a "pass-through" mode. By default, pass-through is on, which means that when the Relay is active, + the network signal from the input network will be passed through as-is to the output side. +- When the "pass-through" mode on the Relay is off, the network signal from the input network will no longer be passed + through as-is to the output side, but you can choose to pass the energy buffer, security settings or (specific) + storage resources of the input network to the output network. +- When using the Relay when "pass-through" mode is off, and when passing all storage resources or specific storage + resources, you can choose the filter mode, whether fuzzy mode is enabled, the access mode and the priority of the + storage exposed to the output network. ### Fixed -- Double slot highlighting in the Grid. -- Improved data corruption protection for storages. +- Double slot highlighting in the Grid. +- Improved data corruption protection for storages. ## [2.0.0-milestone.3.5] - 2024-04-04 ### Added -- Security Card -- Fallback Security Card -- Security Manager +- Security Card +- Fallback Security Card +- Security Manager ### Changed -- The permissions for a Security Card must be configured through the card itself, instead of via the Security Manager. -- The Security Card can be bound to other (currently online) players via its GUI. -- The binding of a Security Card can now be cleared. -- The Security Card tooltip and GUI now show whether the permission has been touched/changed in any way. -- As soon as a Security Manager is placed, the storage network will be locked down by default. Start adding Security Cards to allow or deny specific access to players. -- To not lock the entire network by default for players who do not have a matching Security Card, a Fallback Security Card can be used to configure this behavior. -- Smooth scrolling, screen size and max row stretch are no longer Grid-specific settings, but are now global settings. +- The permissions for a Security Card must be configured through the card itself, instead of via the Security Manager. +- The Security Card can be bound to other (currently online) players via its GUI. +- The binding of a Security Card can now be cleared. +- The Security Card tooltip and GUI now show whether the permission has been touched/changed in any way. +- As soon as a Security Manager is placed, the storage network will be locked down by default. Start adding Security + Cards to allow or deny specific access to players. +- To not lock the entire network by default for players who do not have a matching Security Card, a Fallback Security + Card can be used to configure this behavior. +- Smooth scrolling, screen size and max row stretch are no longer Grid-specific settings, but are now global settings. ### Fixed -- Wireless Grid name not being correct in the GUI. +- Wireless Grid name not being correct in the GUI. ## [2.0.0-milestone.3.4] - 2024-03-16 ### Added -- Void excess mode to storages. +- Void excess mode to storages. ### Fixed -- Fixed losing disk when using Wrench dismantling on the Portable Grid. -- Fixed losing energy when using Wrench dismantling on the Portable Grid and the Controller. -- Fixed changing side buttons not working on Forge. -- Fixed External Storage not displaying empty allowlist warning. -- Fixed incrementing starting from 1 in amount screens not having an intended off-by-one. -- Fixed problems moving network devices with "Carry On" mod. -- Fixed escape key not working on auto-selected Grid search box. +- Fixed losing disk when using Wrench dismantling on the Portable Grid. +- Fixed losing energy when using Wrench dismantling on the Portable Grid and the Controller. +- Fixed changing side buttons not working on Forge. +- Fixed External Storage not displaying empty allowlist warning. +- Fixed incrementing starting from 1 in amount screens not having an intended off-by-one. +- Fixed problems moving network devices with "Carry On" mod. +- Fixed escape key not working on auto-selected Grid search box. ## [2.0.0-milestone.3.3] - 2024-02-17 ### Added -- Ported to Minecraft 1.20.4. -- Custom disk models. Fluid disks now have a different model. -- Portable Grid -- Chinese translation by [@Jiangsubei](https://github.com/Jiangsubei). +- Ported to Minecraft 1.20.4. +- Custom disk models. Fluid disks now have a different model. +- Portable Grid +- Chinese translation by [@Jiangsubei](https://github.com/Jiangsubei). ### Changed -- The Portable Grid now shows an energy bar in the UI. -- The energy bar on creative items now shows the infinity symbol instead of the whole amount. +- The Portable Grid now shows an energy bar in the UI. +- The energy bar on creative items now shows the infinity symbol instead of the whole amount. ### Fixed -- Fixed bug where Grid contents weren't synced properly when a network merge occurs. -- Fixed incompatibility crash with InvMove on Fabric. +- Fixed bug where Grid contents weren't synced properly when a network merge occurs. +- Fixed incompatibility crash with InvMove on Fabric. ## [2.0.0-milestone.3.2] - 2023-11-03 ### Added -- Configuration Card. It copies device configurations and can transfer upgrades. -- Network Receiver -- Network Card -- Network Transmitter +- Configuration Card. It copies device configurations and can transfer upgrades. +- Network Receiver +- Network Card +- Network Transmitter ### Changed -- The Network Transmitter now goes into an "errored" state if there is no connection (anymore) with the Network Receiver (due to chunk unloading for example). -- The Network Transmitter will actively try to reconnect with the Network Receiver if connection is lost. +- The Network Transmitter now goes into an "errored" state if there is no connection (anymore) with the Network + Receiver (due to chunk unloading for example). +- The Network Transmitter will actively try to reconnect with the Network Receiver if connection is lost. ### Fixed -- Inactive Wireless Transmitter model being emissive. -- Unneeded network graph updating after placing a network device. -- Cable blocks not updating connections properly when using wrench. +- Inactive Wireless Transmitter model being emissive. +- Unneeded network graph updating after placing a network device. +- Cable blocks not updating connections properly when using wrench. ## [2.0.0-milestone.3.1] - 2023-10-30 ### Added -- "Open Wireless Grid" keybinding. -- Curios integration on Forge. -- Trinkets integration on Fabric. -- Storage Monitor +- "Open Wireless Grid" keybinding. +- Curios integration on Forge. +- Trinkets integration on Fabric. +- Storage Monitor ### Changed -- You can now recharge the Controller in item form. +- You can now recharge the Controller in item form. ### Fixed -- Fixed a random Grid crash. +- Fixed a random Grid crash. ### Removed -- The `useEnergy` config option for the Wireless Grid. If you do not wish to use energy, use the - Creative Wireless Grid. +- The `useEnergy` config option for the Wireless Grid. If you do not wish to use energy, use the + Creative Wireless Grid. ## [2.0.0-milestone.3.0] - 2023-08-27 ### Added -- Wireless Grid -- Creative Wireless Grid -- Wireless Transmitter -- Range Upgrade -- Creative Range Upgrade -- Fully charged Controller variants to the creative mode tab. +- Wireless Grid +- Creative Wireless Grid +- Wireless Transmitter +- Range Upgrade +- Creative Range Upgrade +- Fully charged Controller variants to the creative mode tab. ### Changed -- The Forge variant now targets NeoForge instead of Forge. -- You can now always open the Wireless Grid, even if there is no network bound or if the Wireless Grid is out of - energy. +- The Forge variant now targets NeoForge instead of Forge. +- You can now always open the Wireless Grid, even if there is no network bound or if the Wireless Grid is out of + energy. ### Fixed -- Fixed inactive Grid slots still rendering resources. -- Fixed being able to interact with inactive Grid. -- Fixed nearly on/off Controller model not being rendered correctly on Forge. -- Fixed Controller energy tooltip not working. +- Fixed inactive Grid slots still rendering resources. +- Fixed being able to interact with inactive Grid. +- Fixed nearly on/off Controller model not being rendered correctly on Forge. +- Fixed Controller energy tooltip not working. ## [2.0.0-milestone.2.14] - 2023-08-19 ### Added -- Support for JEI/REI exclusion zones. -- Support for JEI/REI ghost ingredient dragging. +- Support for JEI/REI exclusion zones. +- Support for JEI/REI ghost ingredient dragging. ## [2.0.0-milestone.2.13] - 2023-08-18 ### Changed -- The Interface now supports fluids. +- The Interface now supports fluids. ### Fixed -- Fixed filter slot hints not being aware of the resource types that they can show in a slot. -- Fixed Exporter only exporting 1 mB per cycle on Forge. -- Fixed not being able to use any blocks on Fabric or Forge. -- Fixed External Storage crash on Fabric when a stack with zero amount is exposed. +- Fixed filter slot hints not being aware of the resource types that they can show in a slot. +- Fixed Exporter only exporting 1 mB per cycle on Forge. +- Fixed not being able to use any blocks on Fabric or Forge. +- Fixed External Storage crash on Fabric when a stack with zero amount is exposed. ## [2.0.0-milestone.2.12] - 2023-08-06 ### Added -- Constructor -- Regulator Upgrade -- Filter slot hints that show which resource will be put in a filter slot and what the effect of the filter is on the device. -- Grid slot hints that show which resource will be inserted or extracted in a Grid. -- Help information to the side buttons by pressing SHIFT. -- Help information on items. -- A warning to the "filter mode" button on the storage screens if there is an allowlist with no configured filters. -- The "supported by" tooltip on upgrade items now shows the devices that accept the upgrade. +- Constructor +- Regulator Upgrade +- Filter slot hints that show which resource will be put in a filter slot and what the effect of the filter is on the + device. +- Grid slot hints that show which resource will be inserted or extracted in a Grid. +- Help information to the side buttons by pressing SHIFT. +- Help information on items. +- A warning to the "filter mode" button on the storage screens if there is an allowlist with no configured filters. +- The "supported by" tooltip on upgrade items now shows the devices that accept the upgrade. ### Changed -- The Constructor crafting recipe now takes 2 diamonds instead of 2 redstone. -- You can now select a "Scheduling mode" in the Constructor: first available, round robin, random. -- The "applicable upgrades" tooltip on the upgrade slot tooltip now shows the upgrade items in item form. -- The Regulator Upgrade now works in an Importer as well. It will only keep importing until the configured amount is reached. -- The Regulator Upgrade now needs to be configured separately, by using the upgrade. It can no longer be configured in the device GUI itself. +- The Constructor crafting recipe now takes 2 diamonds instead of 2 redstone. +- You can now select a "Scheduling mode" in the Constructor: first available, round robin, random. +- The "applicable upgrades" tooltip on the upgrade slot tooltip now shows the upgrade items in item form. +- The Regulator Upgrade now works in an Importer as well. It will only keep importing until the configured amount is + reached. +- The Regulator Upgrade now needs to be configured separately, by using the upgrade. It can no longer be configured in + the device GUI itself. ### Fixed -- Fixed Grid voiding fluids if there was no space in inventory on Fabric. -- Fixed Grid dropping fluid buckets if there was no space in inventory on Forge. -- Fixed compatibility with custom tooltips in the Grid. -- Fixed bundle tooltip in the Grid. -- Fixed changes to access mode or fuzzy mode not being persisted. -- Fixed being able to put any item in the upgrade slots. +- Fixed Grid voiding fluids if there was no space in inventory on Fabric. +- Fixed Grid dropping fluid buckets if there was no space in inventory on Forge. +- Fixed compatibility with custom tooltips in the Grid. +- Fixed bundle tooltip in the Grid. +- Fixed changes to access mode or fuzzy mode not being persisted. +- Fixed being able to put any item in the upgrade slots. ## [2.0.0-milestone.2.11] - 2023-07-04 ### Added -- Ported to Minecraft 1.20.1. +- Ported to Minecraft 1.20.1. ### Fixed -- Fixed not firing block break event on Fabric for the Destructor. +- Fixed not firing block break event on Fabric for the Destructor. ## [2.0.0-milestone.2.10] - 2023-05-29 ### Added -- Ported to Minecraft 1.19.4 -- Destructor -- Fortune Upgrade (I, II and III) -- Silk Touch Upgrade +- Ported to Minecraft 1.19.4 +- Destructor +- Fortune Upgrade (I, II and III) +- Silk Touch Upgrade ### Changed -- The Detector screen now is a proper amount screen by having increment/decrement buttons and scrollbar support. -- The amount in an amount screen is now colored red if the amount is invalid. -- The Destructor crafting recipe now takes 2 diamonds instead of 2 redstone. +- The Detector screen now is a proper amount screen by having increment/decrement buttons and scrollbar support. +- The amount in an amount screen is now colored red if the amount is invalid. +- The Destructor crafting recipe now takes 2 diamonds instead of 2 redstone. ### Fixed -- Fixed missing Speed Upgrade energy usage config on Forge. -- Fixed Grid screen not handling network changes properly. -- Fixed Grid scrollbar scrolling when using SHIFT or CTRL. -- Fixed wrong Controller tooltip. +- Fixed missing Speed Upgrade energy usage config on Forge. +- Fixed Grid screen not handling network changes properly. +- Fixed Grid scrollbar scrolling when using SHIFT or CTRL. +- Fixed wrong Controller tooltip. ### Removed -- Removed "Fuzzy mode" from the Destructor as the filter in the Destructor compares with the block anyway. +- Removed "Fuzzy mode" from the Destructor as the filter in the Destructor compares with the block anyway. ## [2.0.0-milestone.2.9] - 2023-03-31 ### Fixed -- Fixed not being able to update filter slots on servers. +- Fixed not being able to update filter slots on servers. ### Added -- Detector +- Detector ### Changed -- Detectors can now be placed sideways or upside down. -- Detectors no longer detect all resources when unconfigured. -- Redstone updates by Detectors are now rate-limited to once per second. -- For fluids, the Detector now always accepts the amount in buckets. +- Detectors can now be placed sideways or upside down. +- Detectors no longer detect all resources when unconfigured. +- Redstone updates by Detectors are now rate-limited to once per second. +- For fluids, the Detector now always accepts the amount in buckets. ## [2.0.0-milestone.2.8] - 2023-03-04 ### Fixed -- Fixed Disk Drive having 9 slots instead of 8. -- Fixed slow world loading. +- Fixed Disk Drive having 9 slots instead of 8. +- Fixed slow world loading. ### Added -- The upgrade slots now show their supported upgrades. -- Different Cable colors. They only connect to same colored cables or the default cable. -- Colored variant of exporters, importers and external storages. They connect the same way as colored cables. -- Support for using the R/U keys in JEI and REI on Grid slots and filtering slots -- Crafting Grid. -- JEI and REI recipe transfer integration for the Crafting Grid. -- The crafting matrix in the Crafting Grid now has a button and keybinding to clear to the player inventory. - The keybinding is only available on Forge. -- A config option to clear items from the Crafting Grid crafting matrix to the player or network inventory. -- Support for collapsable entries for REI. -- Pressing CTRL + SHIFT on the crafting result slot filters the Grid view based on the items in the crafting matrix. - The reason for this is that you can quickly see how much you have left in the storage network. +- The upgrade slots now show their supported upgrades. +- Different Cable colors. They only connect to same colored cables or the default cable. +- Colored variant of exporters, importers and external storages. They connect the same way as colored cables. +- Support for using the R/U keys in JEI and REI on Grid slots and filtering slots +- Crafting Grid. +- JEI and REI recipe transfer integration for the Crafting Grid. +- The crafting matrix in the Crafting Grid now has a button and keybinding to clear to the player inventory. + The keybinding is only available on Forge. +- A config option to clear items from the Crafting Grid crafting matrix to the player or network inventory. +- Support for collapsable entries for REI. +- Pressing CTRL + SHIFT on the crafting result slot filters the Grid view based on the items in the crafting matrix. + The reason for this is that you can quickly see how much you have left in the storage network. ### Changed -- The button to clear to the network inventory next to the crafting matrix in the Crafting Grid is now disabled if - the Crafting Grid is inactive. -- The keybinding to clear the Crafting Grid matrix to the network inventory is only available on Forge. -- The JEI recipe transfer integration for the Crafting Grid now only supports regular crafting recipes. -- Decreased amount of logging to the info level. Now most logging happens on the debug level. +- The button to clear to the network inventory next to the crafting matrix in the Crafting Grid is now disabled if + the Crafting Grid is inactive. +- The keybinding to clear the Crafting Grid matrix to the network inventory is only available on Forge. +- The JEI recipe transfer integration for the Crafting Grid now only supports regular crafting recipes. +- Decreased amount of logging to the info level. Now most logging happens on the debug level. ### Removed -- Removed amount of stacks and max stacks stored on item storage tooltips. +- Removed amount of stacks and max stacks stored on item storage tooltips. ## [2.0.0-milestone.2.7] - 2023-01-31 ### Added -- Added a "Storage channel" filter in the Grid that determines which resource type is shown. Defaults to "All". +- Added a "Storage channel" filter in the Grid that determines which resource type is shown. Defaults to "All". ### Changed -- Ported to Minecraft 1.19.3. -- The regular Grid now shows fluids as well. -- You can insert fluids in the Grid by right-clicking a fluid container in the Grid slots. -- You no longer have to explicitly select a resource type for the filter configuration slots. You can set a fluid - by right-clicking a fluid container in the filter slots. -- You can no longer insert fluids into the Grid or filter slots straight from the player inventory slots, you have to - insert the fluid while holding the fluid container. +- Ported to Minecraft 1.19.3. +- The regular Grid now shows fluids as well. +- You can insert fluids in the Grid by right-clicking a fluid container in the Grid slots. +- You no longer have to explicitly select a resource type for the filter configuration slots. You can set a fluid + by right-clicking a fluid container in the filter slots. +- You can no longer insert fluids into the Grid or filter slots straight from the player inventory slots, you have to + insert the fluid while holding the fluid container. ### Removed -- Removed the Fluid Grid, which has been combined into the regular Grid. +- Removed the Fluid Grid, which has been combined into the regular Grid. ## [2.0.0-milestone.2.6] - 2023-01-13 ### Fixed -- Fixed missing recoloring recipes for Grid and Controller to default color. -- Fixed missing recoloring recipes for Fluid Grid. +- Fixed missing recoloring recipes for Grid and Controller to default color. +- Fixed missing recoloring recipes for Fluid Grid. ## [2.0.0-milestone.2.5] - 2023-01-11 ### Fixed -- Fixed IO loops caused by Interfaces stealing from each other. -- Fixed storages from an External Storage not reporting when a resource has last changed. +- Fixed IO loops caused by Interfaces stealing from each other. +- Fixed storages from an External Storage not reporting when a resource has last changed. ### Changed -- An Interface that is acting as External Storage can no longer extract or insert from other Interfaces (and itself) - that are acting as External Storage. +- An Interface that is acting as External Storage can no longer extract or insert from other Interfaces (and itself) + that are acting as External Storage. ## [2.0.0-milestone.2.4] - 2022-11-01 ### Fixed -- Fixed missing AutoConfig config option translations on Fabric. -- Fixed Grid resource failing to insert if another resource with the same name but different NBT data already exists. -- Fixed Importer not dropping upgrades when broken. -- Fixed Disk Drive inventory not being available as external inventory on Forge. +- Fixed missing AutoConfig config option translations on Fabric. +- Fixed Grid resource failing to insert if another resource with the same name but different NBT data already exists. +- Fixed Importer not dropping upgrades when broken. +- Fixed Disk Drive inventory not being available as external inventory on Forge. ### Added -- Exporter -- Interface -- External Storage +- Exporter +- Interface +- External Storage ### Changed -- You can now select a "Scheduling mode" in the Exporter: first available, round robin, random. -- The Interface no longer has dedicated import slots. The imported items now go into the export slots. -- The Interface now imports items immediately. -- "Exact mode" has been replaced with "Fuzzy mode", which is off by default for performance. -- The External Storage no longer shows the amount of resources stored on the GUI. -- The External Storage now supports multiple resource types at the same time. -- The External Storage no longer checks for external changes every tick, but rather has a cooldown system. +- You can now select a "Scheduling mode" in the Exporter: first available, round robin, random. +- The Interface no longer has dedicated import slots. The imported items now go into the export slots. +- The Interface now imports items immediately. +- "Exact mode" has been replaced with "Fuzzy mode", which is off by default for performance. +- The External Storage no longer shows the amount of resources stored on the GUI. +- The External Storage now supports multiple resource types at the same time. +- The External Storage no longer checks for external changes every tick, but rather has a cooldown system. ## [2.0.0-milestone.2.3] - 2022-08-26 ### Changed -- Ported to Minecraft 1.19.2. +- Ported to Minecraft 1.19.2. ### Fixed -- Fixed mixin crash on startup on Fabric. +- Fixed mixin crash on startup on Fabric. ### Added -- NoIndium mod is now packaged with the mod on Fabric to avoid launching Sodium without Indium. +- NoIndium mod is now packaged with the mod on Fabric to avoid launching Sodium without Indium. ## [2.0.0-milestone.2.2] - 2022-08-06 ### Changed -- All directional blocks no longer transmit a network signal out of the direction. -- All directional blocks no longer accept a network signal from the facing direction. -- Upgrade items now state the applicable destinations in the tooltip. -- Upgrade items can now have a maximum of 1 type per upgrade inventory. -- You can now SHIFT + CLICK transfer resources in the filter slots again. +- All directional blocks no longer transmit a network signal out of the direction. +- All directional blocks no longer accept a network signal from the facing direction. +- Upgrade items now state the applicable destinations in the tooltip. +- Upgrade items can now have a maximum of 1 type per upgrade inventory. +- You can now SHIFT + CLICK transfer resources in the filter slots again. ### Fixed -- Fixed network connection state not rebuilding after using Wrench on a directional block. -- Fixed Grid tooltip being too small in some cases and item durability not being rendered. +- Fixed network connection state not rebuilding after using Wrench on a directional block. +- Fixed Grid tooltip being too small in some cases and item durability not being rendered. ### Added -- Upgrade -- Speed Upgrade -- Stack Upgrade +- Upgrade +- Speed Upgrade +- Stack Upgrade ## [2.0.0-milestone.2.1] - 2022-07-30 ### Changed -- The Importer will now extract as much of 1 resource type as possible, according to the per tick transfer quota, at - once for all the inventory slots. -- The Importer no longer transmits a network signal on the direction it's facing. -- The Importer can now import from the Disk Drive. -- The Importer no longer has a dedicated item/fluid mode. It will import what it's connected to, 1 resource type per - tick is possible. -- Updated to the latest Forge version. -- Ported to Minecraft 1.19.1. +- The Importer will now extract as much of 1 resource type as possible, according to the per tick transfer quota, at + once for all the inventory slots. +- The Importer no longer transmits a network signal on the direction it's facing. +- The Importer can now import from the Disk Drive. +- The Importer no longer has a dedicated item/fluid mode. It will import what it's connected to, 1 resource type per + tick is possible. +- Updated to the latest Forge version. +- Ported to Minecraft 1.19.1. ### Fixed -- Fixed Grid stack zeroing not working correctly when Auto-selected mode is on. -- Fixed transferring items into Grid with NBT tag on Forge not working correctly. +- Fixed Grid stack zeroing not working correctly when Auto-selected mode is on. +- Fixed transferring items into Grid with NBT tag on Forge not working correctly. ### Added -- Importer. -- Emissive rendering. +- Importer. +- Emissive rendering. ## [2.0.0-milestone.2.0] - 2022-07-05 ### Changed -- Ported to Minecraft 1.19. +- Ported to Minecraft 1.19. ### Added -- Added JEI support to Fabric. -- Added REI support to Forge. +- Added JEI support to Fabric. +- Added REI support to Forge. ### Fixed -- Fixed resource filter container updates not arriving properly on Forge. +- Fixed resource filter container updates not arriving properly on Forge. ## [2.0.0-milestone.1.4] - 2022-06-22 ### Added -- The Wrench now dismantles devices when crouching. - - The Disk Drive in item form now supports rendering of disks that were dismantled. - - In order to retain Controller energy, the Controller must now be dismantled. - - All config and upgrades are transferred to the item. -- You can now use any Wrench from other mods in order to rotate or dismantle. -- Item and fluid storage blocks. -- Initial advancements. +- The Wrench now dismantles devices when crouching. + - The Disk Drive in item form now supports rendering of disks that were dismantled. + - In order to retain Controller energy, the Controller must now be dismantled. + - All config and upgrades are transferred to the item. +- You can now use any Wrench from other mods in order to rotate or dismantle. +- Item and fluid storage blocks. +- Initial advancements. ### Fixed -- Fixed inventory contents of devices not retaining their original order when reloading a world. -- Fixed bug where (already opened) Grid doesn't update if a storage is removed. -- Fixed last modified info in the Grid not being persisted. -- Fixed removals in filter inventory not being saved properly. +- Fixed inventory contents of devices not retaining their original order when reloading a world. +- Fixed bug where (already opened) Grid doesn't update if a storage is removed. +- Fixed last modified info in the Grid not being persisted. +- Fixed removals in filter inventory not being saved properly. ### Changed -- Ported to Minecraft 1.18.2. -- Grid auto-selection and JEI/REI synchronization are now two different options. -- Grid display settings are now stored in the client configuration, no longer per-block. -- You now need to crouch with a dye in order to change the color of a device. -- Item storage capacities are now multiples of 1024 to make it more stack-size friendly. -- Storage tooltips now have colors. -- Storage tooltips now show percentage full. -- Item storage tooltips now show amount of stacks and max stacks stored. +- Ported to Minecraft 1.18.2. +- Grid auto-selection and JEI/REI synchronization are now two different options. +- Grid display settings are now stored in the client configuration, no longer per-block. +- You now need to crouch with a dye in order to change the color of a device. +- Item storage capacities are now multiples of 1024 to make it more stack-size friendly. +- Storage tooltips now have colors. +- Storage tooltips now show percentage full. +- Item storage tooltips now show amount of stacks and max stacks stored. ### Removed -- Removed the Patchouli integration. +- Removed the Patchouli integration. ## [2.0.0-milestone.1.3] - 2022-02-12 ### Added -- Forge support. +- Forge support. ### Fixed -- Any block can be rotated now if the item tag matches `c:wrenches`. +- Any block can be rotated now if the item tag matches `c:wrenches`. ## [2.0.0-milestone.1.2] - 2021-12-23 ### Added -- Fluid Storage Part -- Fluid Storage Disk -- Fluid Grid -- Wrench -- Tooltip search in the Grid with unary operator "#". +- Fluid Storage Part +- Fluid Storage Disk +- Fluid Grid +- Wrench +- Tooltip search in the Grid with unary operator "#". ### Fixed -- Fix Disk Drive item filters not being applied when reloading a world. -- Fix Storage Disk contents being scrambled when other mods are being added or removed. -- Fix rendering crash with the Disk Drive. -- Fix colored blocks having incorrect names in WTHIT. -- Prevent loading unloaded chunks. -- Fix various bugs related to networks and chunk loading/unloading. -- Fix not being able to move network devices with mods like Carrier. -- Fix CTRL + CLICK in creative mode not retaining block data. -- Fix item quantity not being formatted in the Grid. -- Fix amount in detailed Grid tooltip being formatted with units. +- Fix Disk Drive item filters not being applied when reloading a world. +- Fix Storage Disk contents being scrambled when other mods are being added or removed. +- Fix rendering crash with the Disk Drive. +- Fix colored blocks having incorrect names in WTHIT. +- Prevent loading unloaded chunks. +- Fix various bugs related to networks and chunk loading/unloading. +- Fix not being able to move network devices with mods like Carrier. +- Fix CTRL + CLICK in creative mode not retaining block data. +- Fix item quantity not being formatted in the Grid. +- Fix amount in detailed Grid tooltip being formatted with units. ### Changed -- Ported to Minecraft 1.18.1. -- Modularized the codebase. -- The capacity of the various fluid storage part and fluid storage disk tiers are now described in bucket form, no - longer in mB form. -- The Wrench now plays a sound effect when used. -- The Wrench works on any block that has the `fabric:wrenchables` tag. Other mods can identify the Refined Storage - wrench by checking the `fabric:wrenches` tag. -- Made energy usage by the Grid and Disk Drive less power-hungry. -- The Controller now displays an energy bar on the item. -- Upgrade Team Reborn Energy API. -- Made block breaking faster. -- Refined Storage now uses the bundled AutoConfig with ClothConfig and bundles ClothConfig. -- Item quantity of "1" is now always being rendered in the Grid. -- Exact mode is now off by default. +- Ported to Minecraft 1.18.1. +- Modularized the codebase. +- The capacity of the various fluid storage part and fluid storage disk tiers are now described in bucket form, no + longer in mB form. +- The Wrench now plays a sound effect when used. +- The Wrench works on any block that has the `fabric:wrenchables` tag. Other mods can identify the Refined Storage + wrench by checking the `fabric:wrenches` tag. +- Made energy usage by the Grid and Disk Drive less power-hungry. +- The Controller now displays an energy bar on the item. +- Upgrade Team Reborn Energy API. +- Made block breaking faster. +- Refined Storage now uses the bundled AutoConfig with ClothConfig and bundles ClothConfig. +- Item quantity of "1" is now always being rendered in the Grid. +- Exact mode is now off by default. ### Removed -- LibBlockAttributes is no longer used and thus no longer bundled with Refined Storage 2. +- LibBlockAttributes is no longer used and thus no longer bundled with Refined Storage 2. ## [2.0.0-milestone.1.1] - 2021-08-16 ### Added -- New Grid size: "Extra large" (12 rows) +- New Grid size: "Extra large" (12 rows) ### Fixed -- Fix crash when transferring items in the Controller screen. -- Fix Disk Drive leds not being stable. -- Fix block variants not being present on Patchouli book entries. +- Fix crash when transferring items in the Controller screen. +- Fix Disk Drive leds not being stable. +- Fix block variants not being present on Patchouli book entries. ### Changed -- Ported to Minecraft 1.17.1. -- Implemented a new networking system. +- Ported to Minecraft 1.17.1. +- Implemented a new networking system. ## [2.0.0-milestone.1.0] - 2021-05-21 ### Added -- Controller -- Grid -- Disk Drive -- Storage Part -- Storage Disk -- Storage Housing -- Construction Core -- Destruction Core -- Cable -- Machine Casing -- Quartz Enriched Iron -- Block of Quartz Enriched Iron -- (Raw) Basic Processor -- (Raw) Improved Processor -- (Raw) Advanced Processor -- Silicon -- Processor Binding -- Integration with Roughly Enough Items in the form of a REI search box mode. -- Integration with ModMenu. -- Integration with Patchouli. -- Integration with AutoConfig1u. -- Integration with ClothConfig. -- Integration with Team Reborn Energy. +- Controller +- Grid +- Disk Drive +- Storage Part +- Storage Disk +- Storage Housing +- Construction Core +- Destruction Core +- Cable +- Machine Casing +- Quartz Enriched Iron +- Block of Quartz Enriched Iron +- (Raw) Basic Processor +- (Raw) Improved Processor +- (Raw) Advanced Processor +- Silicon +- Processor Binding +- Integration with Roughly Enough Items in the form of a REI search box mode. +- Integration with ModMenu. +- Integration with Patchouli. +- Integration with AutoConfig1u. +- Integration with ClothConfig. +- Integration with Team Reborn Energy. ### Changed -- Re-arranged the Disk Drive GUI slightly. The priority button has been moved to the side. -- The "Priority" screen now has a reset button. -- "Whitelist" has been renamed to "Allowlist". -- "Blacklist" has been renamed to "Blocklist". -- Contents of storages in "insert-only" mode are now visible in the Grid. -- The Grid keybindings got changed slightly. Consult the Patchouli documentation. -- The Grid search bar now has much more powerful searching, supporting expressions. Consult the Patchouli documentation. -- A single item in storage can now be larger than 2,147,483,647. -- You can now place directional blocks facing up/down. -- Emissive rendering isn't implemented yet. -- You can now add multiple controllers to a network to meet the energy requirements of your network. -- The Priority screen now has a "Reset" button. -- The Grid can now use smooth scrolling. -- The Grid now has syntax highlighting for the search query. +- Re-arranged the Disk Drive GUI slightly. The priority button has been moved to the side. +- The "Priority" screen now has a reset button. +- "Whitelist" has been renamed to "Allowlist". +- "Blacklist" has been renamed to "Blocklist". +- Contents of storages in "insert-only" mode are now visible in the Grid. +- The Grid keybindings got changed slightly. Consult the Patchouli documentation. +- The Grid search bar now has much more powerful searching, supporting expressions. Consult the Patchouli documentation. +- A single item in storage can now be larger than 2,147,483,647. +- You can now place directional blocks facing up/down. +- Emissive rendering isn't implemented yet. +- You can now add multiple controllers to a network to meet the energy requirements of your network. +- The Priority screen now has a "Reset" button. +- The Grid can now use smooth scrolling. +- The Grid now has syntax highlighting for the search query. [Unreleased]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.4.4...HEAD diff --git a/README.md b/README.md index 9be5e62d7..72f6f77af 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@

Refined Storage is a mass storage mod for Minecraft that offers the player a network-based storage system, allowing them to store items and fluids on a massively expandable device network.

- [![Build Status](https://github.com/refinedmods/refinedstorage2/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/refinedmods/refinedstorage2/actions/workflows/build.yml) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedstorage2&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedstorage2) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedstorage2&metric=coverage)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedstorage2) [![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedstorage2&metric=code_smells)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedstorage2) [![Crowdin](https://badges.crowdin.net/refined-storage-2/localized.svg)](https://crowdin.com/project/refined-storage-2) [![Downloads on CurseForge](http://cf.way2muchnoise.eu/full_243076_downloads.svg)](http://minecraft.curseforge.com/projects/refined-storage) [![Downloads on Modrinth](https://img.shields.io/modrinth/dt/refined-storage?logo=modrinth)](https://modrinth.com/mod/refined-storage) [![Discord](https://img.shields.io/discord/342942776494653441)](https://discordapp.com/invite/VYzsydb) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE.md) +[![Build Status](https://github.com/refinedmods/refinedstorage2/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/refinedmods/refinedstorage2/actions/workflows/build.yml) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedstorage2&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedstorage2) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedstorage2&metric=coverage)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedstorage2) [![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedstorage2&metric=code_smells)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedstorage2) [![Crowdin](https://badges.crowdin.net/refined-storage-2/localized.svg)](https://crowdin.com/project/refined-storage-2) [![Downloads on CurseForge](http://cf.way2muchnoise.eu/full_243076_downloads.svg)](http://minecraft.curseforge.com/projects/refined-storage) [![Downloads on Modrinth](https://img.shields.io/modrinth/dt/refined-storage?logo=modrinth)](https://modrinth.com/mod/refined-storage) [![Discord](https://img.shields.io/discord/342942776494653441)](https://discordapp.com/invite/VYzsydb) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE.md)
## About diff --git a/build.gradle.kts b/build.gradle.kts index 15067a4da..b568e88fd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,6 +15,9 @@ subprojects { project.extensions.getByType().apply { properties { - property("sonar.coverage.exclusions", "refinedstorage-platform-neoforge/**/*,refinedstorage-platform-fabric/**/*,refinedstorage-platform-common/**/*,refinedstorage-platform-api/**/*") + property( + "sonar.coverage.exclusions", + "refinedstorage-neoforge/**/*,refinedstorage-fabric/**/*,refinedstorage-common/**/*,refinedstorage-common-api/**/*" + ) } } diff --git a/config/intellij-code-style.xml b/config/intellij-code-style.xml index 49b79c2e9..b36a21484 100644 --- a/config/intellij-code-style.xml +++ b/config/intellij-code-style.xml @@ -1,66 +1,66 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/crowdin.yml b/crowdin.yml index 5bb3deca0..37f9d07bb 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -6,8 +6,8 @@ base_path: . pull_request_labels: - skip-changelog files: - - source: /refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/en_us.json - translation: /refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/%locale_with_underscore%.json + - source: /refinedstorage-common/src/main/resources/assets/refinedstorage/lang/en_us.json + translation: /refinedstorage-common/src/main/resources/assets/refinedstorage/lang/%locale_with_underscore%.json languages_mapping: locale_with_underscore: af: af_za diff --git a/doc/architecture/decision/001-multi-loader-architecture.md b/doc/architecture/decision/001-multi-loader-architecture.md index f8a43dd89..3421d5161 100644 --- a/doc/architecture/decision/001-multi-loader-architecture.md +++ b/doc/architecture/decision/001-multi-loader-architecture.md @@ -19,7 +19,7 @@ There will be a common module, and most code should reside in there. The modload reserved for platform specific functionality, like registration, networking, etc. -The module naming follows the standard of `refinedstorage-platform-{name}`. +The module naming follows the standard of `refinedstorage-{name}`. ## Consequences diff --git a/doc/architecture/decision/003-the-platform-api-module.md b/doc/architecture/decision/003-the-platform-api-module.md index d335110af..ac72d0963 100644 --- a/doc/architecture/decision/003-the-platform-api-module.md +++ b/doc/architecture/decision/003-the-platform-api-module.md @@ -16,12 +16,10 @@ Refined Storage 1). ## Decision -Refined Storage will have a modloader-neutral (just like the common module) platform API module which addon mods can -use to integrate with Refined Storage. +Refined Storage will have a modloader-neutral (just like the common module) platform API module which addon mods can use +to integrate with Refined Storage. -Moreover, Refined Storage itself will use this platform API module. - -The module is named `refinedstorage-platform-api`. +Moreover, Refined Storage itself will use this platform API module. The module is named `refinedstorage-common-api`. ## Consequences diff --git a/doc/architecture/decision/004-coverage-requirements.md b/doc/architecture/decision/004-coverage-requirements.md index d7679dda5..8d43c9a22 100644 --- a/doc/architecture/decision/004-coverage-requirements.md +++ b/doc/architecture/decision/004-coverage-requirements.md @@ -13,15 +13,11 @@ Since we are writing more unit tests with our API modules [[1]](#1) we need to e ## Decision We will differentiate between platform modules [[2]](#2) and API modules [[1]](#1). The reason for this is that it's -difficult to test -Minecraft code properly. +difficult to test Minecraft code properly. The platform modules will be tested by Minecraft gametests. Luckily, since our most important (business-logic) code resides in the API modules [[1]](#1) we can put our testing focus there and establish coverage requirements. -However, sometimes it is still advised to write a test for platform code, even if there are no coverage requirements for -it. For that reason, the `refinedstorage-platform-test` module exists, to provide helpers to deal with Minecraft code. - ## Consequences For API modules, this means that: diff --git a/doc/architecture/decision/007-refined-architect.md b/doc/architecture/decision/007-refined-architect.md index 032dd55e5..74e5cc19f 100644 --- a/doc/architecture/decision/007-refined-architect.md +++ b/doc/architecture/decision/007-refined-architect.md @@ -8,13 +8,17 @@ Accepted ## Context -For Refined Storage, we want to build a large ecosystem of addon mods. However, all those addon mods, and even unrelated mods managed by Refined Mods, have a lot of duplication in terms of build infrastructure, GitHub Actions workflows and Gradle setup code. +For Refined Storage, we want to build a large ecosystem of addon mods. However, all those addon mods, and even unrelated +mods managed by Refined Mods, have a lot of duplication in terms of build infrastructure, GitHub Actions workflows and +Gradle setup code. -This duplication makes it difficult to maintain the soon-to-be suite of mods as a whole, especially if we have to upgrade Minecraft. +This duplication makes it difficult to maintain the soon-to-be suite of mods as a whole, especially if we have to +upgrade Minecraft. ## Decision -We introduce [Refined Architect](https://github.com/refinedmods/refinedarchitect): a project that is used by all the mods of Refined Mods. +We introduce [Refined Architect](https://github.com/refinedmods/refinedarchitect): a project that is used by all the +mods of Refined Mods. It contains GitHub workflows, version management and Gradle helpers to help making (cross-platform) mods easier. diff --git a/doc/architecture/decision/008-versioning.md b/doc/architecture/decision/008-versioning.md index 605af230a..e971f27a3 100644 --- a/doc/architecture/decision/008-versioning.md +++ b/doc/architecture/decision/008-versioning.md @@ -23,7 +23,8 @@ We choose [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### How do we store versioning information? -The code doesn't contain version metadata: `build.gradle` specifies a version of `0.0.0` (via [Refined Architect](https://github.com/refinedmods/refinedarchitect)). +The code doesn't contain version metadata: `build.gradle` specifies a version of `0.0.0` ( +via [Refined Architect](https://github.com/refinedmods/refinedarchitect)). The versioning information is entirely contained in Git by using tags. ### When do we determine the next version number? diff --git a/doc/architecture/decision/009-package-by-feature.md b/doc/architecture/decision/009-package-by-feature.md index c3b4dd125..40e14e839 100644 --- a/doc/architecture/decision/009-package-by-feature.md +++ b/doc/architecture/decision/009-package-by-feature.md @@ -8,7 +8,8 @@ Accepted ## Context -Refined Storage adds a lot of content. For ease of maintenance, we need to think about how we are going to segment our packages. +Refined Storage adds a lot of content. For ease of maintenance, we need to think about how we are going to segment our +packages. ## Decision @@ -22,4 +23,5 @@ Implementation provided in [[1]](#1). ## References -- [1] See [implementation](https://github.com/refinedmods/refinedstorage2/commit/d109b09be863c6ea71138091b6ce66c2a573546e) +- [1] + See [implementation](https://github.com/refinedmods/refinedstorage2/commit/d109b09be863c6ea71138091b6ce66c2a573546e) diff --git a/doc/architecture/decision/010-shared-storage.md b/doc/architecture/decision/010-shared-storage.md index 971450fd9..35374b024 100644 --- a/doc/architecture/decision/010-shared-storage.md +++ b/doc/architecture/decision/010-shared-storage.md @@ -40,4 +40,5 @@ Implementation provided in [[1]](#1). ## References -- [1] See [implementation](https://github.com/refinedmods/refinedstorage2/commit/1fd63d17417e387d427b2e018a93df89e31edc0f) +- [1] + See [implementation](https://github.com/refinedmods/refinedstorage2/commit/1fd63d17417e387d427b2e018a93df89e31edc0f) diff --git a/refinedstorage-platform-api/build.gradle.kts b/refinedstorage-common-api/build.gradle.kts similarity index 92% rename from refinedstorage-platform-api/build.gradle.kts rename to refinedstorage-common-api/build.gradle.kts index 538c23597..14141ebd5 100644 --- a/refinedstorage-platform-api/build.gradle.kts +++ b/refinedstorage-common-api/build.gradle.kts @@ -12,7 +12,7 @@ refinedarchitect { } base { - archivesName.set("refinedstorage-platform-api") + archivesName.set("refinedstorage-common-api") } dependencies { diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApi.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/PlatformApi.java similarity index 67% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApi.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/PlatformApi.java index a95741c8b..99ea13e64 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApi.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/PlatformApi.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api; +package com.refinedmods.refinedstorage.common.api; import com.refinedmods.refinedstorage.api.core.component.ComponentMapFactory; import com.refinedmods.refinedstorage.api.network.Network; @@ -7,43 +7,43 @@ import com.refinedmods.refinedstorage.api.network.node.NetworkNode; import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.ConstructorStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.exporter.ExporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHint; -import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHints; -import com.refinedmods.refinedstorage.platform.api.grid.GridSynchronizer; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.importer.ImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.security.BuiltinPermissions; -import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItemHelper; -import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage.platform.api.storage.StorageType; -import com.refinedmods.refinedstorage.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; -import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorExtractionStrategy; -import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorInsertionStrategy; -import com.refinedmods.refinedstorage.platform.api.support.energy.EnergyItemHelper; -import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionLogic; -import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemHelper; -import com.refinedmods.refinedstorage.platform.api.support.registry.PlatformRegistry; -import com.refinedmods.refinedstorage.platform.api.support.resource.RecipeModIngredientConverter; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainerInsertStrategy; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceRendering; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceFactory; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceProvider; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; -import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; +import com.refinedmods.refinedstorage.common.api.constructordestructor.ConstructorStrategyFactory; +import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategyFactory; +import com.refinedmods.refinedstorage.common.api.exporter.ExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.grid.GridInsertionHint; +import com.refinedmods.refinedstorage.common.api.grid.GridInsertionHints; +import com.refinedmods.refinedstorage.common.api.grid.GridSynchronizer; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategyFactory; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategyFactory; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategyFactory; +import com.refinedmods.refinedstorage.common.api.importer.ImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.api.security.BuiltinPermissions; +import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.common.api.storage.StorageContainerItemHelper; +import com.refinedmods.refinedstorage.common.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.common.api.storage.StorageType; +import com.refinedmods.refinedstorage.common.api.storage.externalstorage.PlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorExtractionStrategy; +import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorInsertionStrategy; +import com.refinedmods.refinedstorage.common.api.support.energy.EnergyItemHelper; +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionLogic; +import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemHelper; +import com.refinedmods.refinedstorage.common.api.support.registry.PlatformRegistry; +import com.refinedmods.refinedstorage.common.api.support.resource.RecipeModIngredientConverter; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainerInsertStrategy; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceFactory; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceRendering; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceFactory; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceProvider; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeRegistry; +import com.refinedmods.refinedstorage.common.api.wirelesstransmitter.WirelessTransmitterRangeModifier; import java.util.Collection; import java.util.Optional; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApiProxy.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/PlatformApiProxy.java similarity index 80% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApiProxy.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/PlatformApiProxy.java index 2b2116e60..33ea17001 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApiProxy.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/PlatformApiProxy.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api; +package com.refinedmods.refinedstorage.common.api; import com.refinedmods.refinedstorage.api.core.component.ComponentMapFactory; import com.refinedmods.refinedstorage.api.network.Network; @@ -7,43 +7,43 @@ import com.refinedmods.refinedstorage.api.network.node.NetworkNode; import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.ConstructorStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.exporter.ExporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHint; -import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHints; -import com.refinedmods.refinedstorage.platform.api.grid.GridSynchronizer; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.importer.ImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.security.BuiltinPermissions; -import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItemHelper; -import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage.platform.api.storage.StorageType; -import com.refinedmods.refinedstorage.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; -import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorExtractionStrategy; -import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorInsertionStrategy; -import com.refinedmods.refinedstorage.platform.api.support.energy.EnergyItemHelper; -import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionLogic; -import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemHelper; -import com.refinedmods.refinedstorage.platform.api.support.registry.PlatformRegistry; -import com.refinedmods.refinedstorage.platform.api.support.resource.RecipeModIngredientConverter; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainerInsertStrategy; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceRendering; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceFactory; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceProvider; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; -import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; +import com.refinedmods.refinedstorage.common.api.constructordestructor.ConstructorStrategyFactory; +import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategyFactory; +import com.refinedmods.refinedstorage.common.api.exporter.ExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.grid.GridInsertionHint; +import com.refinedmods.refinedstorage.common.api.grid.GridInsertionHints; +import com.refinedmods.refinedstorage.common.api.grid.GridSynchronizer; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategyFactory; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategyFactory; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategyFactory; +import com.refinedmods.refinedstorage.common.api.importer.ImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.api.security.BuiltinPermissions; +import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.common.api.storage.StorageContainerItemHelper; +import com.refinedmods.refinedstorage.common.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.common.api.storage.StorageType; +import com.refinedmods.refinedstorage.common.api.storage.externalstorage.PlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorExtractionStrategy; +import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorInsertionStrategy; +import com.refinedmods.refinedstorage.common.api.support.energy.EnergyItemHelper; +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionLogic; +import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemHelper; +import com.refinedmods.refinedstorage.common.api.support.registry.PlatformRegistry; +import com.refinedmods.refinedstorage.common.api.support.resource.RecipeModIngredientConverter; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainerInsertStrategy; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceFactory; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceRendering; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceFactory; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceProvider; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeRegistry; +import com.refinedmods.refinedstorage.common.api.wirelesstransmitter.WirelessTransmitterRangeModifier; import java.util.Collection; import java.util.Optional; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/RefinedStoragePlugin.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStoragePlugin.java similarity index 78% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/RefinedStoragePlugin.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStoragePlugin.java index c92be54d5..36a761ec8 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/RefinedStoragePlugin.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStoragePlugin.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api; +package com.refinedmods.refinedstorage.common.api; import org.apiguardian.api.API; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/configurationcard/ConfigurationCardTarget.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/configurationcard/ConfigurationCardTarget.java similarity index 91% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/configurationcard/ConfigurationCardTarget.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/configurationcard/ConfigurationCardTarget.java index ac995ccef..efdacae3c 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/configurationcard/ConfigurationCardTarget.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/configurationcard/ConfigurationCardTarget.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.configurationcard; +package com.refinedmods.refinedstorage.common.api.configurationcard; import java.util.Collections; import java.util.List; diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/configurationcard/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/configurationcard/package-info.java new file mode 100644 index 000000000..a651883e9 --- /dev/null +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/configurationcard/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.api.configurationcard; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/ConstructorStrategy.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/ConstructorStrategy.java similarity index 86% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/ConstructorStrategy.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/ConstructorStrategy.java index e0b93a012..cafed3938 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/ConstructorStrategy.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/ConstructorStrategy.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.constructordestructor; +package com.refinedmods.refinedstorage.common.api.constructordestructor; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.resource.ResourceKey; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/ConstructorStrategyFactory.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/ConstructorStrategyFactory.java similarity index 82% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/ConstructorStrategyFactory.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/ConstructorStrategyFactory.java index fbeea71de..3b211168e 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/ConstructorStrategyFactory.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/ConstructorStrategyFactory.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.api.constructordestructor; +package com.refinedmods.refinedstorage.common.api.constructordestructor; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import java.util.Optional; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/DestructorStrategy.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/DestructorStrategy.java similarity index 92% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/DestructorStrategy.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/DestructorStrategy.java index 833fc5f84..c974e6b2f 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/DestructorStrategy.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/DestructorStrategy.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.constructordestructor; +package com.refinedmods.refinedstorage.common.api.constructordestructor; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.resource.filter.Filter; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/DestructorStrategyFactory.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/DestructorStrategyFactory.java similarity index 82% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/DestructorStrategyFactory.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/DestructorStrategyFactory.java index 02726b09e..c77471c2a 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/DestructorStrategyFactory.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/DestructorStrategyFactory.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.api.constructordestructor; +package com.refinedmods.refinedstorage.common.api.constructordestructor; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import java.util.Optional; diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/package-info.java new file mode 100644 index 000000000..d820b71e1 --- /dev/null +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.api.constructordestructor; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter/AmountOverride.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/exporter/AmountOverride.java similarity index 92% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter/AmountOverride.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/exporter/AmountOverride.java index 0b058a671..922f4a145 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter/AmountOverride.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/exporter/AmountOverride.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.exporter; +package com.refinedmods.refinedstorage.common.api.exporter; import com.refinedmods.refinedstorage.api.resource.ResourceKey; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter/ExporterTransferStrategyFactory.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/exporter/ExporterTransferStrategyFactory.java similarity index 81% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter/ExporterTransferStrategyFactory.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/exporter/ExporterTransferStrategyFactory.java index 31f92ddad..7b9f473a0 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter/ExporterTransferStrategyFactory.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/exporter/ExporterTransferStrategyFactory.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.api.exporter; +package com.refinedmods.refinedstorage.common.api.exporter; import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/exporter/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/exporter/package-info.java new file mode 100644 index 000000000..11f69bf0a --- /dev/null +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/exporter/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.api.exporter; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/Grid.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/Grid.java similarity index 86% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/Grid.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/Grid.java index 5fcb6e97a..92e194e46 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/Grid.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/Grid.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.api.grid; +package com.refinedmods.refinedstorage.common.api.grid; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; import com.refinedmods.refinedstorage.api.grid.watcher.GridWatcher; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.Storage; import com.refinedmods.refinedstorage.api.storage.TrackedResourceAmount; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceType; import java.util.List; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridInsertionHint.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/GridInsertionHint.java similarity index 86% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridInsertionHint.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/GridInsertionHint.java index 9a679207b..8f2eef1f3 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridInsertionHint.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/GridInsertionHint.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.grid; +package com.refinedmods.refinedstorage.common.api.grid; import java.util.Optional; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridInsertionHints.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/GridInsertionHints.java similarity index 86% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridInsertionHints.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/GridInsertionHints.java index 53deb941d..aef34e5d6 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridInsertionHints.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/GridInsertionHints.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.grid; +package com.refinedmods.refinedstorage.common.api.grid; import java.util.List; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridResourceAttributeKeys.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/GridResourceAttributeKeys.java similarity index 83% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridResourceAttributeKeys.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/GridResourceAttributeKeys.java index 9e9ed0322..6a5d59efc 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridResourceAttributeKeys.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/GridResourceAttributeKeys.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.grid; +package com.refinedmods.refinedstorage.common.api.grid; import com.refinedmods.refinedstorage.api.grid.view.GridResourceAttributeKey; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridScrollMode.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/GridScrollMode.java similarity index 62% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridScrollMode.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/GridScrollMode.java index 85c180b1b..aa1090d5a 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridScrollMode.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/GridScrollMode.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.grid; +package com.refinedmods.refinedstorage.common.api.grid; public enum GridScrollMode { GRID_TO_INVENTORY, diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridSynchronizer.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/GridSynchronizer.java similarity index 91% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridSynchronizer.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/GridSynchronizer.java index 7ecbe81eb..78105128f 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridSynchronizer.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/GridSynchronizer.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.grid; +package com.refinedmods.refinedstorage.common.api.grid; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/package-info.java similarity index 78% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/package-info.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/package-info.java index 1e1668a02..d47924ff7 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/package-info.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common; +package com.refinedmods.refinedstorage.common.api.grid; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridExtractionStrategy.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridExtractionStrategy.java similarity index 66% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridExtractionStrategy.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridExtractionStrategy.java index 832526986..c94b431c7 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridExtractionStrategy.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridExtractionStrategy.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.api.grid.strategy; +package com.refinedmods.refinedstorage.common.api.grid.strategy; import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; import org.apiguardian.api.API; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridExtractionStrategyFactory.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridExtractionStrategyFactory.java similarity index 74% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridExtractionStrategyFactory.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridExtractionStrategyFactory.java index 76f27d674..3d0b8cd8d 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridExtractionStrategyFactory.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridExtractionStrategyFactory.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.api.grid.strategy; +package com.refinedmods.refinedstorage.common.api.grid.strategy; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.grid.Grid; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.inventory.AbstractContainerMenu; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridInsertionStrategy.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridInsertionStrategy.java similarity index 83% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridInsertionStrategy.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridInsertionStrategy.java index 53aa2fab5..d97d9ea4e 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridInsertionStrategy.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridInsertionStrategy.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.grid.strategy; +package com.refinedmods.refinedstorage.common.api.grid.strategy; import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridInsertionStrategyFactory.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridInsertionStrategyFactory.java similarity index 74% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridInsertionStrategyFactory.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridInsertionStrategyFactory.java index 894cc86ba..e697368d7 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridInsertionStrategyFactory.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridInsertionStrategyFactory.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.api.grid.strategy; +package com.refinedmods.refinedstorage.common.api.grid.strategy; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.grid.Grid; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.inventory.AbstractContainerMenu; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridScrollingStrategy.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridScrollingStrategy.java similarity index 50% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridScrollingStrategy.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridScrollingStrategy.java index 259b8c19b..131883ae4 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridScrollingStrategy.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridScrollingStrategy.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.api.grid.strategy; +package com.refinedmods.refinedstorage.common.api.grid.strategy; -import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; import org.apiguardian.api.API; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridScrollingStrategyFactory.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridScrollingStrategyFactory.java similarity index 74% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridScrollingStrategyFactory.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridScrollingStrategyFactory.java index 64a97283b..354116999 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridScrollingStrategyFactory.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridScrollingStrategyFactory.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.api.grid.strategy; +package com.refinedmods.refinedstorage.common.api.grid.strategy; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.grid.Grid; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.inventory.AbstractContainerMenu; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/package-info.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/package-info.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/package-info.java index 23dd8bd2c..2059caa77 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/package-info.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.detector; +package com.refinedmods.refinedstorage.common.api.grid.strategy; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/AbstractPlatformGridResource.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/view/AbstractPlatformGridResource.java similarity index 97% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/AbstractPlatformGridResource.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/view/AbstractPlatformGridResource.java index b2e0011f7..f633c8021 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/AbstractPlatformGridResource.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/view/AbstractPlatformGridResource.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.grid.view; +package com.refinedmods.refinedstorage.common.api.grid.view; import com.refinedmods.refinedstorage.api.grid.view.GridResourceAttributeKey; import com.refinedmods.refinedstorage.api.grid.view.GridView; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/PlatformGridResource.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/view/PlatformGridResource.java similarity index 75% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/PlatformGridResource.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/view/PlatformGridResource.java index 5bbdf86b3..9436be8f2 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/PlatformGridResource.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/view/PlatformGridResource.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.api.grid.view; +package com.refinedmods.refinedstorage.common.api.grid.view; import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; import com.refinedmods.refinedstorage.api.grid.view.GridResource; -import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; import java.util.List; import java.util.Optional; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/view/package-info.java similarity index 77% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/package-info.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/view/package-info.java index 18db855f9..16e4076d6 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/package-info.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/view/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.storage; +package com.refinedmods.refinedstorage.common.api.grid.view; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/importer/ImporterTransferStrategyFactory.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/importer/ImporterTransferStrategyFactory.java similarity index 73% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/importer/ImporterTransferStrategyFactory.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/importer/ImporterTransferStrategyFactory.java index 1d6dc7c2f..9a0ca18bf 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/importer/ImporterTransferStrategyFactory.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/importer/ImporterTransferStrategyFactory.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.api.importer; +package com.refinedmods.refinedstorage.common.api.importer; import com.refinedmods.refinedstorage.api.network.node.importer.ImporterTransferStrategy; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/importer/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/importer/package-info.java new file mode 100644 index 000000000..6a98b4281 --- /dev/null +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/importer/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.api.importer; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/package-info.java similarity index 79% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/package-info.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/package-info.java index 79c26c237..7035db66a 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/package-info.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api; +package com.refinedmods.refinedstorage.common.api; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/BuiltinPermissions.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/BuiltinPermissions.java similarity index 84% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/BuiltinPermissions.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/BuiltinPermissions.java index c1a9267b5..a936ac77d 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/BuiltinPermissions.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/BuiltinPermissions.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.security; +package com.refinedmods.refinedstorage.common.api.security; import org.apiguardian.api.API; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/PlatformPermission.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/PlatformPermission.java similarity index 92% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/PlatformPermission.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/PlatformPermission.java index 45101a1e4..367a9d227 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/PlatformPermission.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/PlatformPermission.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.security; +package com.refinedmods.refinedstorage.common.api.security; import com.refinedmods.refinedstorage.api.network.security.Permission; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/PlatformSecurityNetworkComponent.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/PlatformSecurityNetworkComponent.java similarity index 88% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/PlatformSecurityNetworkComponent.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/PlatformSecurityNetworkComponent.java index 151dd1607..7541379be 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/PlatformSecurityNetworkComponent.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/PlatformSecurityNetworkComponent.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.security; +package com.refinedmods.refinedstorage.common.api.security; import com.refinedmods.refinedstorage.api.network.security.Permission; import com.refinedmods.refinedstorage.api.network.security.SecurityNetworkComponent; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/SecurityHelper.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/SecurityHelper.java similarity index 89% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/SecurityHelper.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/SecurityHelper.java index 2f52e636e..c320fa99f 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/SecurityHelper.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/SecurityHelper.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.api.security; +package com.refinedmods.refinedstorage.common.api.security; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.network.node.NetworkNode; import com.refinedmods.refinedstorage.api.network.security.Permission; -import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; import java.util.Set; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/SecurityPolicyContainerItem.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/SecurityPolicyContainerItem.java similarity index 94% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/SecurityPolicyContainerItem.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/SecurityPolicyContainerItem.java index 97fa69ad5..f65a2bbb6 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/SecurityPolicyContainerItem.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/SecurityPolicyContainerItem.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.security; +package com.refinedmods.refinedstorage.common.api.security; import com.refinedmods.refinedstorage.api.network.security.SecurityActor; import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/package-info.java new file mode 100644 index 000000000..66be52667 --- /dev/null +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.api.security; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/AbstractStorageContainerBlockItem.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/AbstractStorageContainerBlockItem.java similarity index 96% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/AbstractStorageContainerBlockItem.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/AbstractStorageContainerBlockItem.java index 47563d6ef..9200098c3 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/AbstractStorageContainerBlockItem.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/AbstractStorageContainerBlockItem.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.api.storage; +package com.refinedmods.refinedstorage.common.api.storage; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.PlatformApi; import java.util.List; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/AbstractStorageContainerItem.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/AbstractStorageContainerItem.java similarity index 96% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/AbstractStorageContainerItem.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/AbstractStorageContainerItem.java index cd38b2c6d..9a0a7fd39 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/AbstractStorageContainerItem.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/AbstractStorageContainerItem.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.api.storage; +package com.refinedmods.refinedstorage.common.api.storage; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.PlatformApi; import java.util.List; import java.util.Optional; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/PlayerActor.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/PlayerActor.java similarity index 90% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/PlayerActor.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/PlayerActor.java index b8321e13c..7a4dbdcaa 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/PlayerActor.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/PlayerActor.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.storage; +package com.refinedmods.refinedstorage.common.api.storage; import com.refinedmods.refinedstorage.api.storage.Actor; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/SerializableStorage.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/SerializableStorage.java similarity index 81% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/SerializableStorage.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/SerializableStorage.java index 77ae4446e..fba0e2057 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/SerializableStorage.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/SerializableStorage.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.api.storage; +package com.refinedmods.refinedstorage.common.api.storage; import com.refinedmods.refinedstorage.api.storage.Storage; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.PlatformApi; import com.mojang.serialization.Codec; import org.apiguardian.api.API; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageBlockEntity.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/StorageBlockEntity.java similarity index 87% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageBlockEntity.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/StorageBlockEntity.java index 6b5896f17..5ad9716f5 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageBlockEntity.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/StorageBlockEntity.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.storage; +package com.refinedmods.refinedstorage.common.api.storage; import java.util.UUID; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageContainerItem.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/StorageContainerItem.java similarity index 90% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageContainerItem.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/StorageContainerItem.java index 0bf359500..4537dc62a 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageContainerItem.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/StorageContainerItem.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.storage; +package com.refinedmods.refinedstorage.common.api.storage; import java.util.Optional; import java.util.function.Predicate; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageContainerItemHelper.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/StorageContainerItemHelper.java similarity index 97% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageContainerItemHelper.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/StorageContainerItemHelper.java index aa8449768..0ac5f8798 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageContainerItemHelper.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/StorageContainerItemHelper.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.storage; +package com.refinedmods.refinedstorage.common.api.storage; import java.util.List; import java.util.Map; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageInfo.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/StorageInfo.java similarity index 90% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageInfo.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/StorageInfo.java index 760486109..766e7befa 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageInfo.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/StorageInfo.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.storage; +package com.refinedmods.refinedstorage.common.api.storage; import com.refinedmods.refinedstorage.api.storage.Storage; import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorage; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageRepository.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/StorageRepository.java similarity index 94% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageRepository.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/StorageRepository.java index e0ff56515..e66e6823a 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageRepository.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/StorageRepository.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.storage; +package com.refinedmods.refinedstorage.common.api.storage; import java.util.Optional; import java.util.UUID; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageType.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/StorageType.java similarity index 89% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageType.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/StorageType.java index a6c8ce7a0..fc28551dd 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageType.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/StorageType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.storage; +package com.refinedmods.refinedstorage.common.api.storage; import com.refinedmods.refinedstorage.api.resource.ResourceKey; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/channel/FuzzyStorageChannel.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/channel/FuzzyStorageChannel.java similarity index 86% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/channel/FuzzyStorageChannel.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/channel/FuzzyStorageChannel.java index 2e765ec92..5b54648d9 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/channel/FuzzyStorageChannel.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/channel/FuzzyStorageChannel.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.storage.channel; +package com.refinedmods.refinedstorage.common.api.storage.channel; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/channel/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/channel/package-info.java new file mode 100644 index 000000000..de20afe59 --- /dev/null +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/channel/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.api.storage.channel; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/externalstorage/PlatformExternalStorageProviderFactory.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/externalstorage/PlatformExternalStorageProviderFactory.java similarity index 87% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/externalstorage/PlatformExternalStorageProviderFactory.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/externalstorage/PlatformExternalStorageProviderFactory.java index 001428a90..b9d34882b 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/externalstorage/PlatformExternalStorageProviderFactory.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/externalstorage/PlatformExternalStorageProviderFactory.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.storage.externalstorage; +package com.refinedmods.refinedstorage.common.api.storage.externalstorage; import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/externalstorage/package-info.java similarity index 73% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/package-info.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/externalstorage/package-info.java index d4ea50522..9ce0ab5f5 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/package-info.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/externalstorage/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.constructordestructor; +package com.refinedmods.refinedstorage.common.api.storage.externalstorage; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/package-info.java new file mode 100644 index 000000000..31f5bf6a1 --- /dev/null +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.api.storage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/StorageMonitorExtractionStrategy.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storagemonitor/StorageMonitorExtractionStrategy.java similarity index 88% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/StorageMonitorExtractionStrategy.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storagemonitor/StorageMonitorExtractionStrategy.java index 1dba4ccdd..4250a07b6 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/StorageMonitorExtractionStrategy.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storagemonitor/StorageMonitorExtractionStrategy.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.storagemonitor; +package com.refinedmods.refinedstorage.common.api.storagemonitor; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.resource.ResourceKey; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/StorageMonitorInsertionStrategy.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storagemonitor/StorageMonitorInsertionStrategy.java similarity index 88% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/StorageMonitorInsertionStrategy.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storagemonitor/StorageMonitorInsertionStrategy.java index 0525ea66e..6653fa5d2 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/StorageMonitorInsertionStrategy.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storagemonitor/StorageMonitorInsertionStrategy.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.storagemonitor; +package com.refinedmods.refinedstorage.common.api.storagemonitor; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.resource.ResourceKey; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storagemonitor/package-info.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/package-info.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storagemonitor/package-info.java index bae0e4c98..54eee32f0 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/package-info.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storagemonitor/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.grid.view; +package com.refinedmods.refinedstorage.common.api.storagemonitor; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/AmountFormatting.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/AmountFormatting.java similarity index 96% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/AmountFormatting.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/AmountFormatting.java index e3483dbb7..6997df638 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/AmountFormatting.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/AmountFormatting.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support; +package com.refinedmods.refinedstorage.common.api.support; import java.math.RoundingMode; import java.text.DecimalFormat; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/HelpTooltipComponent.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/HelpTooltipComponent.java similarity index 88% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/HelpTooltipComponent.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/HelpTooltipComponent.java index 0cdeb6f30..222cea2fe 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/HelpTooltipComponent.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/HelpTooltipComponent.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support; +package com.refinedmods.refinedstorage.common.api.support; import net.minecraft.network.chat.Component; import net.minecraft.world.inventory.tooltip.TooltipComponent; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/AbstractEnergyBlockItem.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractEnergyBlockItem.java similarity index 96% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/AbstractEnergyBlockItem.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractEnergyBlockItem.java index 4573fa03c..d5e8fa2aa 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/AbstractEnergyBlockItem.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractEnergyBlockItem.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.energy; +package com.refinedmods.refinedstorage.common.api.support.energy; import java.util.List; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/AbstractEnergyItem.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractEnergyItem.java similarity index 95% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/AbstractEnergyItem.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractEnergyItem.java index 620198d93..acef2462b 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/AbstractEnergyItem.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractEnergyItem.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.energy; +package com.refinedmods.refinedstorage.common.api.support.energy; import java.util.List; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/AbstractNetworkBoundEnergyItem.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractNetworkBoundEnergyItem.java similarity index 85% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/AbstractNetworkBoundEnergyItem.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractNetworkBoundEnergyItem.java index 94fe2078b..a3cea83ef 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/AbstractNetworkBoundEnergyItem.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractNetworkBoundEnergyItem.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.api.support.energy; +package com.refinedmods.refinedstorage.common.api.support.energy; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemHelper; -import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemSession; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceHandlerItem; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemHelper; +import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemSession; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceHandlerItem; import java.util.List; import java.util.Optional; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/EnergyItemHelper.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/EnergyItemHelper.java similarity index 90% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/EnergyItemHelper.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/EnergyItemHelper.java index c72fa5f48..0ecd5c6ef 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/EnergyItemHelper.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/EnergyItemHelper.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.energy; +package com.refinedmods.refinedstorage.common.api.support.energy; import java.util.List; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/TransferableBlockEntityEnergy.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/TransferableBlockEntityEnergy.java similarity index 79% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/TransferableBlockEntityEnergy.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/TransferableBlockEntityEnergy.java index 5fd19425c..c64b4a6e9 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/TransferableBlockEntityEnergy.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/TransferableBlockEntityEnergy.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.energy; +package com.refinedmods.refinedstorage.common.api.support.energy; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/view/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/package-info.java similarity index 76% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/view/package-info.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/package-info.java index 7f1778746..febba993b 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/view/package-info.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.fabric.grid.view; +package com.refinedmods.refinedstorage.common.api.support.energy; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/AbstractNetworkNodeContainerBlockEntity.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/AbstractNetworkNodeContainerBlockEntity.java similarity index 95% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/AbstractNetworkNodeContainerBlockEntity.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/AbstractNetworkNodeContainerBlockEntity.java index eee9544f5..309b9c3b5 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/AbstractNetworkNodeContainerBlockEntity.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/AbstractNetworkNodeContainerBlockEntity.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.api.support.network; +package com.refinedmods.refinedstorage.common.api.support.network; import com.refinedmods.refinedstorage.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.PlatformApi; import java.util.HashSet; import java.util.Set; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/ConnectionLogic.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/ConnectionLogic.java similarity index 82% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/ConnectionLogic.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/ConnectionLogic.java index 12f650612..167263c91 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/ConnectionLogic.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/ConnectionLogic.java @@ -1,4 +1,6 @@ -package com.refinedmods.refinedstorage.platform.api.support.network; +package com.refinedmods.refinedstorage.common.api.support.network; + +import com.refinedmods.refinedstorage.common.api.PlatformApi; import net.minecraft.core.Direction; import net.minecraft.world.level.Level; @@ -11,7 +13,7 @@ public interface ConnectionLogic { * Add outgoing connections here. * Called when a node is about to be added into the network graph. * If the outgoing connections ever change, call {@link - * com.refinedmods.refinedstorage.platform.api.PlatformApi#onNetworkNodeContainerUpdated( + * PlatformApi#onNetworkNodeContainerUpdated( *InWorldNetworkNodeContainer, Level)}. * * @param sink the sink that accepts outgoing connections @@ -22,7 +24,7 @@ public interface ConnectionLogic { * Returns whether the (not yet discovered) node can accept an incoming connection. * Changes to this return value won't cause a rebuild of the network state. * If the return value ever changes, call {@link - * com.refinedmods.refinedstorage.platform.api.PlatformApi#onNetworkNodeContainerUpdated( + * PlatformApi#onNetworkNodeContainerUpdated( *InWorldNetworkNodeContainer, Level)}. * * @param incomingDirection the incoming direction diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/ConnectionSink.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/ConnectionSink.java similarity index 83% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/ConnectionSink.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/ConnectionSink.java index dff5d3cf9..5f4bea828 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/ConnectionSink.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/ConnectionSink.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.network; +package com.refinedmods.refinedstorage.common.api.support.network; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/InWorldNetworkNodeContainer.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/InWorldNetworkNodeContainer.java similarity index 88% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/InWorldNetworkNodeContainer.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/InWorldNetworkNodeContainer.java index 218818e4b..016826098 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/InWorldNetworkNodeContainer.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/InWorldNetworkNodeContainer.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.network; +package com.refinedmods.refinedstorage.common.api.support.network; import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/NetworkNodeContainerBlockEntity.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/NetworkNodeContainerBlockEntity.java similarity index 69% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/NetworkNodeContainerBlockEntity.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/NetworkNodeContainerBlockEntity.java index a8342354c..7d481cf00 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/NetworkNodeContainerBlockEntity.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/NetworkNodeContainerBlockEntity.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.api.support.network; +package com.refinedmods.refinedstorage.common.api.support.network; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.security.SecurityHelper; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.security.SecurityHelper; import java.util.Set; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/NetworkBoundItemHelper.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/NetworkBoundItemHelper.java similarity index 82% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/NetworkBoundItemHelper.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/NetworkBoundItemHelper.java index a1082b94b..8c44742bd 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/NetworkBoundItemHelper.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/NetworkBoundItemHelper.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.api.support.network.bounditem; +package com.refinedmods.refinedstorage.common.api.support.network.bounditem; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; import java.util.List; import java.util.Optional; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/NetworkBoundItemSession.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/NetworkBoundItemSession.java similarity index 80% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/NetworkBoundItemSession.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/NetworkBoundItemSession.java index bccff77aa..a5ebc18cb 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/NetworkBoundItemSession.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/NetworkBoundItemSession.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.network.bounditem; +package com.refinedmods.refinedstorage.common.api.support.network.bounditem; import com.refinedmods.refinedstorage.api.network.Network; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/NetworkBoundItemTargetBlockEntity.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/NetworkBoundItemTargetBlockEntity.java similarity index 79% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/NetworkBoundItemTargetBlockEntity.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/NetworkBoundItemTargetBlockEntity.java index 78b9ee5b0..a23287044 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/NetworkBoundItemTargetBlockEntity.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/NetworkBoundItemTargetBlockEntity.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.network.bounditem; +package com.refinedmods.refinedstorage.common.api.support.network.bounditem; import com.refinedmods.refinedstorage.api.network.Network; diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/package-info.java new file mode 100644 index 000000000..cf593c9f5 --- /dev/null +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.api.support.network.bounditem; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/package-info.java new file mode 100644 index 000000000..726444374 --- /dev/null +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.api.support.network; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/package-info.java new file mode 100644 index 000000000..880217947 --- /dev/null +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.api.support; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/registry/PlatformRegistry.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/registry/PlatformRegistry.java similarity index 95% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/registry/PlatformRegistry.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/registry/PlatformRegistry.java index 5c72be8db..198f09867 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/registry/PlatformRegistry.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/registry/PlatformRegistry.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.registry; +package com.refinedmods.refinedstorage.common.api.support.registry; import java.util.List; import java.util.Optional; diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/registry/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/registry/package-info.java new file mode 100644 index 000000000..49b77fb44 --- /dev/null +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/registry/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.api.support.registry; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/AbstractResourceType.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/AbstractResourceType.java similarity index 95% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/AbstractResourceType.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/AbstractResourceType.java index 7c911413e..6bd422fd7 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/AbstractResourceType.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/AbstractResourceType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.resource; +package com.refinedmods.refinedstorage.common.api.support.resource; import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/FluidOperationResult.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/FluidOperationResult.java similarity index 77% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/FluidOperationResult.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/FluidOperationResult.java index 281930bcc..2416a0d46 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/FluidOperationResult.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/FluidOperationResult.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.resource; +package com.refinedmods.refinedstorage.common.api.support.resource; import net.minecraft.world.item.ItemStack; import org.apiguardian.api.API; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/FuzzyModeNormalizer.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/FuzzyModeNormalizer.java similarity index 76% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/FuzzyModeNormalizer.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/FuzzyModeNormalizer.java index c622348cd..420cfb9db 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/FuzzyModeNormalizer.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/FuzzyModeNormalizer.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.resource; +package com.refinedmods.refinedstorage.common.api.support.resource; import com.refinedmods.refinedstorage.api.resource.ResourceKey; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/PlatformResourceKey.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/PlatformResourceKey.java similarity index 80% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/PlatformResourceKey.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/PlatformResourceKey.java index 539789045..220f29367 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/PlatformResourceKey.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/PlatformResourceKey.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.resource; +package com.refinedmods.refinedstorage.common.api.support.resource; import com.refinedmods.refinedstorage.api.resource.ResourceKey; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/RecipeModIngredientConverter.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/RecipeModIngredientConverter.java similarity index 82% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/RecipeModIngredientConverter.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/RecipeModIngredientConverter.java index fbaa33558..7ba4a1b38 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/RecipeModIngredientConverter.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/RecipeModIngredientConverter.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.resource; +package com.refinedmods.refinedstorage.common.api.support.resource; import java.util.Optional; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceContainer.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceContainer.java similarity index 96% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceContainer.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceContainer.java index 2baa83546..cdc582672 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceContainer.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceContainer.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.resource; +package com.refinedmods.refinedstorage.common.api.support.resource; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceContainerInsertStrategy.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceContainerInsertStrategy.java similarity index 94% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceContainerInsertStrategy.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceContainerInsertStrategy.java index b3b86c41c..139039666 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceContainerInsertStrategy.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceContainerInsertStrategy.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.resource; +package com.refinedmods.refinedstorage.common.api.support.resource; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceFactory.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceFactory.java similarity index 86% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceFactory.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceFactory.java index fbf51c942..13aa5da6d 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceFactory.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceFactory.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.resource; +package com.refinedmods.refinedstorage.common.api.support.resource; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceRendering.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceRendering.java similarity index 92% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceRendering.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceRendering.java index b52992ed4..1c50428d7 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceRendering.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceRendering.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.resource; +package com.refinedmods.refinedstorage.common.api.support.resource; import com.refinedmods.refinedstorage.api.resource.ResourceKey; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceType.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceType.java similarity index 95% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceType.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceType.java index ca9780374..28eb15877 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceType.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.resource; +package com.refinedmods.refinedstorage.common.api.support.resource; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; import com.refinedmods.refinedstorage.api.grid.view.GridResource; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/list/FuzzyResourceList.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/list/FuzzyResourceList.java similarity index 81% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/list/FuzzyResourceList.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/list/FuzzyResourceList.java index 0539365f0..0842d3181 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/list/FuzzyResourceList.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/list/FuzzyResourceList.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.api.support.resource.list; +package com.refinedmods.refinedstorage.common.api.support.resource.list; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.resource.list.ResourceList; -import com.refinedmods.refinedstorage.platform.api.support.resource.FuzzyModeNormalizer; +import com.refinedmods.refinedstorage.common.api.support.resource.FuzzyModeNormalizer; import java.util.Collection; diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/list/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/list/package-info.java new file mode 100644 index 000000000..66b1e7e0a --- /dev/null +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/list/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.api.support.resource.list; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/package-info.java new file mode 100644 index 000000000..c641b384d --- /dev/null +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.api.support.resource; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/slotreference/SlotReference.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReference.java similarity index 83% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/slotreference/SlotReference.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReference.java index 903495ad3..d26400480 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/slotreference/SlotReference.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReference.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.slotreference; +package com.refinedmods.refinedstorage.common.api.support.slotreference; import java.util.Optional; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/slotreference/SlotReferenceFactory.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceFactory.java similarity index 89% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/slotreference/SlotReferenceFactory.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceFactory.java index aab1c8c84..1cce040bc 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/slotreference/SlotReferenceFactory.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceFactory.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.api.support.slotreference; +package com.refinedmods.refinedstorage.common.api.support.slotreference; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.PlatformApi; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/slotreference/SlotReferenceHandlerItem.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceHandlerItem.java similarity index 81% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/slotreference/SlotReferenceHandlerItem.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceHandlerItem.java index edeeabe5c..1b7d19b49 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/slotreference/SlotReferenceHandlerItem.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceHandlerItem.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.slotreference; +package com.refinedmods.refinedstorage.common.api.support.slotreference; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.ItemStack; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/slotreference/SlotReferenceProvider.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceProvider.java similarity index 81% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/slotreference/SlotReferenceProvider.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceProvider.java index c86829255..0a5c915d1 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/slotreference/SlotReferenceProvider.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceProvider.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support.slotreference; +package com.refinedmods.refinedstorage.common.api.support.slotreference; import java.util.List; import java.util.Set; diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/package-info.java new file mode 100644 index 000000000..7da81bf24 --- /dev/null +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.api.support.slotreference; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/AbstractUpgradeItem.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/AbstractUpgradeItem.java similarity index 94% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/AbstractUpgradeItem.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/AbstractUpgradeItem.java index 6875c70a3..4bb7c9740 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/AbstractUpgradeItem.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/AbstractUpgradeItem.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.upgrade; +package com.refinedmods.refinedstorage.common.api.upgrade; import java.util.Optional; import java.util.Set; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeDestination.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeDestination.java similarity index 82% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeDestination.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeDestination.java index 8b8ddcac5..3c4abfbd0 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeDestination.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeDestination.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.upgrade; +package com.refinedmods.refinedstorage.common.api.upgrade; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeItem.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeItem.java similarity index 72% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeItem.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeItem.java index 9af926696..2ae8b8a16 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeItem.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeItem.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.upgrade; +package com.refinedmods.refinedstorage.common.api.upgrade; import org.apiguardian.api.API; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeMapping.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeMapping.java similarity index 90% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeMapping.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeMapping.java index e7580389e..69a533d7c 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeMapping.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeMapping.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.upgrade; +package com.refinedmods.refinedstorage.common.api.upgrade; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeRegistry.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeRegistry.java similarity index 91% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeRegistry.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeRegistry.java index 06560bc67..b4fda40de 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeRegistry.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeRegistry.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.upgrade; +package com.refinedmods.refinedstorage.common.api.upgrade; import java.util.Set; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeState.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeState.java similarity index 78% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeState.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeState.java index c3a1c5dfe..df672beac 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeState.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeState.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.upgrade; +package com.refinedmods.refinedstorage.common.api.upgrade; import org.apiguardian.api.API; diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/package-info.java new file mode 100644 index 000000000..82d6ec3a6 --- /dev/null +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.api.upgrade; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/WirelessTransmitter.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/wirelesstransmitter/WirelessTransmitter.java similarity index 82% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/WirelessTransmitter.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/wirelesstransmitter/WirelessTransmitter.java index 2ef7a63e5..ab78c05f4 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/WirelessTransmitter.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/wirelesstransmitter/WirelessTransmitter.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.wirelesstransmitter; +package com.refinedmods.refinedstorage.common.api.wirelesstransmitter; import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.Level; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/WirelessTransmitterRangeModifier.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/wirelesstransmitter/WirelessTransmitterRangeModifier.java similarity index 66% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/WirelessTransmitterRangeModifier.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/wirelesstransmitter/WirelessTransmitterRangeModifier.java index f90e85cb7..fa4325bfb 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/WirelessTransmitterRangeModifier.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/wirelesstransmitter/WirelessTransmitterRangeModifier.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.api.wirelesstransmitter; +package com.refinedmods.refinedstorage.common.api.wirelesstransmitter; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import org.apiguardian.api.API; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/configurationcard/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/wirelesstransmitter/package-info.java similarity index 74% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/configurationcard/package-info.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/wirelesstransmitter/package-info.java index 2024bca10..3b7dd5a89 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/configurationcard/package-info.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/wirelesstransmitter/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.configurationcard; +package com.refinedmods.refinedstorage.common.api.wirelesstransmitter; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/test/java/com/refinedmods/refinedstorage/platform/api/support/AmountFormattingTest.java b/refinedstorage-common-api/src/test/java/com/refinedmods/refinedstorage/common/api/support/AmountFormattingTest.java similarity index 98% rename from refinedstorage-platform-api/src/test/java/com/refinedmods/refinedstorage/platform/api/support/AmountFormattingTest.java rename to refinedstorage-common-api/src/test/java/com/refinedmods/refinedstorage/common/api/support/AmountFormattingTest.java index fd635d791..faefd7d76 100644 --- a/refinedstorage-platform-api/src/test/java/com/refinedmods/refinedstorage/platform/api/support/AmountFormattingTest.java +++ b/refinedstorage-common-api/src/test/java/com/refinedmods/refinedstorage/common/api/support/AmountFormattingTest.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.api.support; +package com.refinedmods.refinedstorage.common.api.support; import org.junit.jupiter.api.Test; diff --git a/refinedstorage-platform-common/build.gradle.kts b/refinedstorage-common/build.gradle.kts similarity index 87% rename from refinedstorage-platform-common/build.gradle.kts rename to refinedstorage-common/build.gradle.kts index 4d92d6eb1..79c862962 100644 --- a/refinedstorage-platform-common/build.gradle.kts +++ b/refinedstorage-common/build.gradle.kts @@ -12,11 +12,11 @@ refinedarchitect { } base { - archivesName.set("refinedstorage-platform-common") + archivesName.set("refinedstorage-common") } dependencies { - api(project(":refinedstorage-platform-api")) + api(project(":refinedstorage-common-api")) api(project(":refinedstorage-core-api")) api(project(":refinedstorage-resource-api")) api(project(":refinedstorage-storage-api")) diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/black.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/black.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/black.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/black.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/brown.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/brown.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/brown.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/brown.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/cyan.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/cyan.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/cyan.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/cyan.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/green.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/green.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/green.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/green.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/light_blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/light_blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/light_blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/light_blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/light_gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/light_gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/light_gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/light_gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/lime.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/lime.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/lime.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/lime.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/magenta.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/magenta.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/magenta.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/magenta.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/orange.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/orange.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/orange.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/orange.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/pink.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/pink.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/pink.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/pink.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/purple.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/purple.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/purple.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/purple.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/red.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/red.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/red.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/red.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/white.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/white.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/white.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/white.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/yellow.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/yellow.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/yellow.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/yellow.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/black.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/black.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/black.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/black.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/brown.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/brown.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/brown.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/brown.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/cyan.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/cyan.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/cyan.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/cyan.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/green.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/green.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/green.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/green.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/light_blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/light_blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/light_blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/light_blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/light_gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/light_gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/light_gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/light_gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/lime.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/lime.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/lime.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/lime.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/magenta.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/magenta.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/magenta.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/magenta.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/orange.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/orange.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/orange.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/orange.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/pink.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/pink.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/pink.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/pink.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/purple.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/purple.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/purple.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/purple.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/red.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/red.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/red.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/red.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/white.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/white.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/white.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/white.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/yellow.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/yellow.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/yellow.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/yellow.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/black.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/black.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/black.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/black.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/brown.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/brown.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/brown.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/brown.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/cyan.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/cyan.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/cyan.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/cyan.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/green.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/green.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/green.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/green.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/light_blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/light_blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/light_blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/light_blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/light_gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/light_gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/light_gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/light_gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/lime.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/lime.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/lime.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/lime.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/magenta.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/magenta.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/magenta.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/magenta.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/orange.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/orange.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/orange.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/orange.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/pink.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/pink.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/pink.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/pink.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/purple.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/purple.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/purple.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/purple.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/red.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/red.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/red.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/red.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/white.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/white.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/white.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/white.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/yellow.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/yellow.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/yellow.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/controller/yellow.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/black.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/black.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/black.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/black.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/brown.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/brown.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/brown.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/brown.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/cyan.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/cyan.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/cyan.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/cyan.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/green.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/green.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/green.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/green.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/inactive.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/inactive.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/inactive.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/inactive.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/lime.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/lime.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/lime.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/lime.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/magenta.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/magenta.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/magenta.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/magenta.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/orange.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/orange.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/orange.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/orange.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/pink.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/pink.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/pink.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/pink.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/purple.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/purple.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/purple.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/purple.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/red.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/red.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/red.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/red.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/white.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/white.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/white.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/white.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/yellow.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/yellow.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/yellow.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/yellow.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/black.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/black.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/black.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/black.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/brown.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/brown.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/brown.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/brown.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/cyan.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/cyan.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/cyan.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/cyan.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/green.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/green.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/green.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/green.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/light_blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/light_blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/light_blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/light_blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/light_gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/light_gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/light_gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/light_gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/lime.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/lime.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/lime.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/lime.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/magenta.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/magenta.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/magenta.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/magenta.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/orange.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/orange.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/orange.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/orange.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/pink.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/pink.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/pink.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/pink.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/purple.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/purple.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/purple.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/purple.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/red.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/red.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/red.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/red.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/white.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/white.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/white.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/white.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/yellow.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/yellow.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/yellow.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/detector/yellow.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_black.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_black.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_black.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_black.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_brown.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_brown.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_brown.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_brown.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_cyan.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_cyan.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_cyan.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_cyan.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_green.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_green.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_green.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_green.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_light_blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_light_blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_light_blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_light_blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_light_gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_light_gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_light_gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_light_gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_lime.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_lime.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_lime.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_lime.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_magenta.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_magenta.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_magenta.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_magenta.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_orange.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_orange.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_orange.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_orange.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_pink.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_pink.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_pink.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_pink.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_purple.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_purple.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_purple.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_purple.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_red.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_red.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_red.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_red.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_white.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_white.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_white.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_white.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_yellow.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_yellow.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_yellow.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_yellow.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/black.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/black.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/black.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/black.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/brown.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/brown.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/brown.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/brown.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/cyan.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/cyan.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/cyan.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/cyan.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/green.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/green.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/green.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/green.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/inactive.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/inactive.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/inactive.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/inactive.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/light_blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/light_blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/light_blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/light_blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/light_gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/light_gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/light_gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/light_gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/lime.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/lime.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/lime.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/lime.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/magenta.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/magenta.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/magenta.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/magenta.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/orange.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/orange.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/orange.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/orange.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/pink.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/pink.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/pink.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/pink.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/purple.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/purple.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/purple.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/purple.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/red.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/red.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/red.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/red.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/white.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/white.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/white.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/white.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/yellow.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/yellow.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/yellow.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/yellow.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/black.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/black.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/black.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/black.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/brown.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/brown.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/brown.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/brown.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/cyan.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/cyan.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/cyan.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/cyan.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/green.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/green.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/green.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/green.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/inactive.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/inactive.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/inactive.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/inactive.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/light_blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/light_blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/light_blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/light_blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/light_gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/light_gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/light_gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/light_gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/lime.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/lime.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/lime.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/lime.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/magenta.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/magenta.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/magenta.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/magenta.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/orange.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/orange.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/orange.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/orange.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/pink.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/pink.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/pink.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/pink.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/purple.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/purple.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/purple.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/purple.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/red.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/red.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/red.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/red.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/white.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/white.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/white.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/white.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/yellow.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/yellow.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/yellow.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/grid/yellow.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/black.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/black.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/black.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/black.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/brown.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/brown.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/brown.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/brown.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/cyan.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/cyan.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/cyan.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/cyan.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/green.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/green.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/green.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/green.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/inactive.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/inactive.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/inactive.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/inactive.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/lime.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/lime.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/lime.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/lime.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/magenta.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/magenta.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/magenta.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/magenta.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/orange.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/orange.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/orange.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/orange.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/pink.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/pink.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/pink.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/pink.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/purple.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/purple.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/purple.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/purple.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/red.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/red.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/red.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/red.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/white.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/white.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/white.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/white.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/yellow.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/yellow.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/yellow.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/yellow.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/black.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/black.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/black.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/black.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/brown.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/brown.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/brown.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/brown.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/cyan.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/cyan.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/cyan.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/cyan.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/error.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/error.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/error.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/error.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/green.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/green.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/green.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/green.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/inactive.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/inactive.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/inactive.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/inactive.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/lime.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/lime.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/lime.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/lime.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/magenta.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/magenta.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/magenta.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/magenta.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/orange.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/orange.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/orange.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/orange.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/pink.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/pink.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/pink.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/pink.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/purple.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/purple.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/purple.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/purple.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/red.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/red.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/red.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/red.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/white.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/white.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/white.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/white.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/yellow.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/yellow.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/yellow.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/yellow.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/black.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/black.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/black.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/black.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/brown.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/brown.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/brown.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/brown.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/cyan.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/cyan.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/cyan.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/cyan.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/green.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/green.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/green.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/green.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/inactive.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/inactive.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/inactive.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/inactive.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/light_blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/light_blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/light_blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/light_blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/light_gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/light_gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/light_gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/light_gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/lime.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/lime.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/lime.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/lime.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/magenta.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/magenta.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/magenta.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/magenta.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/orange.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/orange.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/orange.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/orange.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/pink.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/pink.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/pink.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/pink.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/purple.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/purple.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/purple.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/purple.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/red.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/red.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/red.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/red.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/white.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/white.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/white.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/white.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/yellow.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/yellow.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/yellow.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/relay/yellow.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/black.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/black.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/black.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/black.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/brown.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/brown.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/brown.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/brown.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/cyan.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/cyan.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/cyan.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/cyan.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/green.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/green.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/green.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/green.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/inactive.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/inactive.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/inactive.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/inactive.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/lime.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/lime.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/lime.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/lime.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/magenta.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/magenta.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/magenta.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/magenta.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/orange.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/orange.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/orange.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/orange.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/pink.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/pink.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/pink.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/pink.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/purple.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/purple.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/purple.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/purple.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/red.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/red.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/red.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/red.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/white.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/white.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/white.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/white.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/yellow.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/yellow.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/yellow.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/yellow.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/black.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/black.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/black.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/black.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/brown.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/brown.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/brown.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/brown.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/cyan.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/cyan.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/cyan.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/cyan.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/green.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/green.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/green.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/green.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/light_blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/light_blue.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/light_blue.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/light_blue.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/light_gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/light_gray.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/light_gray.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/light_gray.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/lime.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/lime.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/lime.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/lime.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/magenta.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/magenta.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/magenta.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/magenta.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/orange.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/orange.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/orange.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/orange.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/pink.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/pink.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/pink.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/pink.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/purple.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/purple.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/purple.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/purple.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/red.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/red.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/red.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/red.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/white.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/white.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/white.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/white.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/yellow.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/yellow.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/yellow.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/yellow.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_cable.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_cable.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_constructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_constructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_crafting_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_crafting_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_creative_controller.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_creative_controller.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_destructor.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_destructor.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_detector.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_detector.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_disk_interface.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_disk_interface.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_exporter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_exporter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_external_storage.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_external_storage.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_grid.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_grid.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_importer.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_importer.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_network_receiver.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_network_receiver.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_network_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_network_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_relay.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_relay.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_security_manager.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_security_manager.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_creative_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_creative_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_creative_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_creative_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_creative_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_creative_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/creative_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/creative_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_creative_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_creative_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_creative_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_creative_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_creative_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_creative_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_creative_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_creative_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_creative_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_creative_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_creative_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_creative_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_creative_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_creative_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_creative_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_creative_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_creative_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_creative_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_creative_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_creative_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_creative_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_creative_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_creative_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_creative_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_creative_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_creative_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_cable.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_cable.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_cable.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_cable.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_constructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_constructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_constructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_constructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_controller.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_controller.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_controller.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_controller.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_crafting_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_crafting_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_crafting_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_destructor.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_destructor.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_destructor.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_destructor.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_detector.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_detector.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_detector.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_detector.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_disk_interface.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_disk_interface.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_disk_interface.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_exporter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_exporter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_exporter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_exporter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_external_storage.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_external_storage.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_external_storage.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_grid.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_grid.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_grid.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_grid.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_importer.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_importer.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_importer.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_importer.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_network_receiver.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_network_receiver.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_network_receiver.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_network_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_network_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_network_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_relay.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_relay.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_relay.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_relay.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_security_manager.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_security_manager.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_security_manager.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_wireless_transmitter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_wireless_transmitter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/cables.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/cables.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/cables.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/cables.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/constructors.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/constructors.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/constructors.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/constructors.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/controllers.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/controllers.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/controllers.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/controllers.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/crafting_grids.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/crafting_grids.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/crafting_grids.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/crafting_grids.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/creative_controllers.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/creative_controllers.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/creative_controllers.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/creative_controllers.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/destructors.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/destructors.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/destructors.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/destructors.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/detectors.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/detectors.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/detectors.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/detectors.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/disk_interfaces.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/disk_interfaces.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/disk_interfaces.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/disk_interfaces.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/exporters.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/exporters.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/exporters.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/exporters.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/external_storages.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/external_storages.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/external_storages.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/external_storages.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/fluid_storage_disks.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/fluid_storage_disks.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/fluid_storage_disks.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/fluid_storage_disks.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/grids.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/grids.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/grids.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/grids.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/importers.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/importers.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/importers.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/importers.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/network_receivers.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/network_receivers.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/network_receivers.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/network_receivers.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/network_transmitters.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/network_transmitters.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/network_transmitters.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/network_transmitters.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/relays.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/relays.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/relays.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/relays.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/security_managers.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/security_managers.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/security_managers.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/security_managers.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/storage_disks.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/storage_disks.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/storage_disks.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/storage_disks.json diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/wireless_transmitters.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/wireless_transmitters.json similarity index 100% rename from refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/wireless_transmitters.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/wireless_transmitters.json diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractClientModInitializer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractClientModInitializer.java similarity index 61% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractClientModInitializer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractClientModInitializer.java index 4612068f4..397b17bbd 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractClientModInitializer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractClientModInitializer.java @@ -1,41 +1,42 @@ -package com.refinedmods.refinedstorage.platform.common; +package com.refinedmods.refinedstorage.common; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.common.constructordestructor.ConstructorScreen; -import com.refinedmods.refinedstorage.platform.common.constructordestructor.DestructorScreen; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.content.KeyMappings; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.controller.ControllerScreen; -import com.refinedmods.refinedstorage.platform.common.detector.DetectorScreen; -import com.refinedmods.refinedstorage.platform.common.exporter.ExporterScreen; -import com.refinedmods.refinedstorage.platform.common.grid.GridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.grid.WirelessGridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.grid.screen.CraftingGridScreen; -import com.refinedmods.refinedstorage.platform.common.grid.screen.GridScreen; -import com.refinedmods.refinedstorage.platform.common.grid.screen.hint.FluidGridInsertionHint; -import com.refinedmods.refinedstorage.platform.common.iface.InterfaceScreen; -import com.refinedmods.refinedstorage.platform.common.importer.ImporterScreen; -import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterScreen; -import com.refinedmods.refinedstorage.platform.common.networking.RelayScreen; -import com.refinedmods.refinedstorage.platform.common.security.FallbackSecurityCardScreen; -import com.refinedmods.refinedstorage.platform.common.security.SecurityCardScreen; -import com.refinedmods.refinedstorage.platform.common.security.SecurityManagerScreen; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.DiskDriveScreen; -import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.DiskInterfaceScreen; -import com.refinedmods.refinedstorage.platform.common.storage.externalstorage.ExternalStorageScreen; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridScreen; -import com.refinedmods.refinedstorage.platform.common.storage.storageblock.FluidStorageBlockScreen; -import com.refinedmods.refinedstorage.platform.common.storage.storageblock.ItemStorageBlockScreen; -import com.refinedmods.refinedstorage.platform.common.storagemonitor.StorageMonitorScreen; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceRendering; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResourceRendering; -import com.refinedmods.refinedstorage.platform.common.upgrade.RegulatorUpgradeScreen; -import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.WirelessTransmitterScreen; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.constructordestructor.ConstructorScreen; +import com.refinedmods.refinedstorage.common.constructordestructor.DestructorScreen; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.common.content.KeyMappings; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.controller.ControllerScreen; +import com.refinedmods.refinedstorage.common.detector.DetectorScreen; +import com.refinedmods.refinedstorage.common.exporter.ExporterScreen; +import com.refinedmods.refinedstorage.common.grid.GridContainerMenu; +import com.refinedmods.refinedstorage.common.grid.WirelessGridContainerMenu; +import com.refinedmods.refinedstorage.common.grid.screen.CraftingGridScreen; +import com.refinedmods.refinedstorage.common.grid.screen.GridScreen; +import com.refinedmods.refinedstorage.common.grid.screen.hint.FluidGridInsertionHint; +import com.refinedmods.refinedstorage.common.iface.InterfaceScreen; +import com.refinedmods.refinedstorage.common.importer.ImporterScreen; +import com.refinedmods.refinedstorage.common.networking.NetworkTransmitterScreen; +import com.refinedmods.refinedstorage.common.networking.RelayScreen; +import com.refinedmods.refinedstorage.common.security.FallbackSecurityCardScreen; +import com.refinedmods.refinedstorage.common.security.SecurityCardScreen; +import com.refinedmods.refinedstorage.common.security.SecurityManagerScreen; +import com.refinedmods.refinedstorage.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.common.storage.ItemStorageVariant; +import com.refinedmods.refinedstorage.common.storage.diskdrive.DiskDriveScreen; +import com.refinedmods.refinedstorage.common.storage.diskinterface.DiskInterfaceScreen; +import com.refinedmods.refinedstorage.common.storage.externalstorage.ExternalStorageScreen; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridScreen; +import com.refinedmods.refinedstorage.common.storage.storageblock.FluidStorageBlockScreen; +import com.refinedmods.refinedstorage.common.storage.storageblock.ItemStorageBlockScreen; +import com.refinedmods.refinedstorage.common.storagemonitor.StorageMonitorScreen; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.FluidResourceRendering; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.resource.ItemResourceRendering; +import com.refinedmods.refinedstorage.common.upgrade.RegulatorUpgradeScreen; +import com.refinedmods.refinedstorage.common.util.IdentifierUtil; +import com.refinedmods.refinedstorage.common.wirelesstransmitter.WirelessTransmitterScreen; import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; @@ -48,8 +49,6 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.MenuType; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; - public abstract class AbstractClientModInitializer { protected static void registerScreens(final ScreenRegistration registration) { registration.register(Menus.INSTANCE.getDiskDrive(), DiskDriveScreen::new); @@ -112,7 +111,7 @@ protected static void handleInputEvents() { } protected static void registerDiskModels() { - final ResourceLocation diskModel = createIdentifier("block/disk/disk"); + final ResourceLocation diskModel = IdentifierUtil.createIdentifier("block/disk/disk"); for (final ItemStorageVariant variant : ItemStorageVariant.values()) { PlatformApi.INSTANCE.getStorageContainerItemHelper().registerDiskModel( Items.INSTANCE.getItemStorageDisk(variant), @@ -120,7 +119,7 @@ protected static void registerDiskModels() { ); } - final ResourceLocation fluidDiskModel = createIdentifier("block/disk/fluid_disk"); + final ResourceLocation fluidDiskModel = IdentifierUtil.createIdentifier("block/disk/fluid_disk"); for (final FluidStorageVariant variant : FluidStorageVariant.values()) { PlatformApi.INSTANCE.getStorageContainerItemHelper().registerDiskModel( Items.INSTANCE.getFluidStorageDisk(variant), diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractModInitializer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractModInitializer.java similarity index 61% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractModInitializer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractModInitializer.java index 345124bd1..48f9b5db1 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractModInitializer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractModInitializer.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common; +package com.refinedmods.refinedstorage.common; import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; import com.refinedmods.refinedstorage.api.network.impl.energy.EnergyNetworkComponentImpl; @@ -8,136 +8,136 @@ import com.refinedmods.refinedstorage.api.network.node.GraphNetworkComponent; import com.refinedmods.refinedstorage.api.network.security.SecurityNetworkComponent; import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.PlatformApiProxy; -import com.refinedmods.refinedstorage.platform.api.security.PlatformSecurityNetworkComponent; -import com.refinedmods.refinedstorage.platform.api.upgrade.AbstractUpgradeItem; -import com.refinedmods.refinedstorage.platform.common.configurationcard.ConfigurationCardItem; -import com.refinedmods.refinedstorage.platform.common.configurationcard.ConfigurationCardState; -import com.refinedmods.refinedstorage.platform.common.constructordestructor.BlockBreakDestructorStrategyFactory; -import com.refinedmods.refinedstorage.platform.common.constructordestructor.ConstructorBlockEntity; -import com.refinedmods.refinedstorage.platform.common.constructordestructor.ConstructorContainerMenu; -import com.refinedmods.refinedstorage.platform.common.constructordestructor.DestructorBlockEntity; -import com.refinedmods.refinedstorage.platform.common.constructordestructor.DestructorContainerMenu; -import com.refinedmods.refinedstorage.platform.common.constructordestructor.FluidBreakDestructorStrategyFactory; -import com.refinedmods.refinedstorage.platform.common.constructordestructor.ItemDropConstructorStrategyFactory; -import com.refinedmods.refinedstorage.platform.common.constructordestructor.ItemPickupDestructorStrategyFactory; -import com.refinedmods.refinedstorage.platform.common.constructordestructor.PlaceBlockConstructorStrategy; -import com.refinedmods.refinedstorage.platform.common.constructordestructor.PlaceFireworksConstructorStrategy; -import com.refinedmods.refinedstorage.platform.common.constructordestructor.PlaceFluidConstructorStrategy; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntityTypeFactory; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.content.ContentIds; -import com.refinedmods.refinedstorage.platform.common.content.DataComponents; -import com.refinedmods.refinedstorage.platform.common.content.ExtendedMenuTypeFactory; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.content.LootFunctions; -import com.refinedmods.refinedstorage.platform.common.content.MenuTypeFactory; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.content.RegistryCallback; -import com.refinedmods.refinedstorage.platform.common.content.Sounds; -import com.refinedmods.refinedstorage.platform.common.controller.ControllerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.controller.ControllerContainerMenu; -import com.refinedmods.refinedstorage.platform.common.controller.ControllerData; -import com.refinedmods.refinedstorage.platform.common.controller.ControllerType; -import com.refinedmods.refinedstorage.platform.common.detector.DetectorBlockEntity; -import com.refinedmods.refinedstorage.platform.common.detector.DetectorContainerMenu; -import com.refinedmods.refinedstorage.platform.common.exporter.ExporterBlockEntity; -import com.refinedmods.refinedstorage.platform.common.exporter.ExporterContainerMenu; -import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridBlockEntity; -import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.grid.GridBlockEntity; -import com.refinedmods.refinedstorage.platform.common.grid.GridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.grid.GridData; -import com.refinedmods.refinedstorage.platform.common.grid.PortableGridData; -import com.refinedmods.refinedstorage.platform.common.grid.WirelessGridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.grid.WirelessGridData; -import com.refinedmods.refinedstorage.platform.common.iface.InterfaceBlock; -import com.refinedmods.refinedstorage.platform.common.iface.InterfaceBlockEntity; -import com.refinedmods.refinedstorage.platform.common.iface.InterfaceContainerMenu; -import com.refinedmods.refinedstorage.platform.common.iface.InterfaceData; -import com.refinedmods.refinedstorage.platform.common.importer.ImporterBlockEntity; -import com.refinedmods.refinedstorage.platform.common.importer.ImporterContainerMenu; -import com.refinedmods.refinedstorage.platform.common.misc.ProcessorItem; -import com.refinedmods.refinedstorage.platform.common.misc.WrenchItem; -import com.refinedmods.refinedstorage.platform.common.networking.NetworkCardItem; -import com.refinedmods.refinedstorage.platform.common.networking.NetworkReceiverBlockEntity; -import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterBlockEntity; -import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterContainerMenu; -import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterData; -import com.refinedmods.refinedstorage.platform.common.networking.RelayBlockEntity; -import com.refinedmods.refinedstorage.platform.common.networking.RelayContainerMenu; -import com.refinedmods.refinedstorage.platform.common.security.BuiltinPermission; -import com.refinedmods.refinedstorage.platform.common.security.FallbackSecurityCardContainerMenu; -import com.refinedmods.refinedstorage.platform.common.security.PlatformSecurityNetworkComponentImpl; -import com.refinedmods.refinedstorage.platform.common.security.PlayerBoundSecurityCardData; -import com.refinedmods.refinedstorage.platform.common.security.SecurityCardBoundPlayer; -import com.refinedmods.refinedstorage.platform.common.security.SecurityCardContainerMenu; -import com.refinedmods.refinedstorage.platform.common.security.SecurityCardData; -import com.refinedmods.refinedstorage.platform.common.security.SecurityCardPermissions; -import com.refinedmods.refinedstorage.platform.common.security.SecurityManagerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.security.SecurityManagerContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.StorageTypes; -import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.DiskDriveBlock; -import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.DiskDriveContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.DiskInterfaceContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storage.externalstorage.ExternalStorageBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.externalstorage.ExternalStorageContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlock; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlockContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridItemContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridLootItemFunction; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridType; -import com.refinedmods.refinedstorage.platform.common.storage.storageblock.FluidStorageBlock; -import com.refinedmods.refinedstorage.platform.common.storage.storageblock.FluidStorageBlockBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.storageblock.FluidStorageBlockBlockItem; -import com.refinedmods.refinedstorage.platform.common.storage.storageblock.FluidStorageBlockContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storage.storageblock.ItemStorageBlock; -import com.refinedmods.refinedstorage.platform.common.storage.storageblock.ItemStorageBlockBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.storageblock.ItemStorageBlockBlockItem; -import com.refinedmods.refinedstorage.platform.common.storage.storageblock.ItemStorageBlockContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storage.storageblock.StorageBlockData; -import com.refinedmods.refinedstorage.platform.common.storage.storageblock.StorageBlockLootItemFunction; -import com.refinedmods.refinedstorage.platform.common.storage.storagedisk.FluidStorageDiskItem; -import com.refinedmods.refinedstorage.platform.common.storage.storagedisk.ItemStorageDiskItem; -import com.refinedmods.refinedstorage.platform.common.storagemonitor.FluidStorageMonitorExtractionStrategy; -import com.refinedmods.refinedstorage.platform.common.storagemonitor.FluidStorageMonitorInsertionStrategy; -import com.refinedmods.refinedstorage.platform.common.storagemonitor.ItemStorageMonitorExtractionStrategy; -import com.refinedmods.refinedstorage.platform.common.storagemonitor.ItemStorageMonitorInsertionStrategy; -import com.refinedmods.refinedstorage.platform.common.storagemonitor.StorageMonitorBlock; -import com.refinedmods.refinedstorage.platform.common.storagemonitor.StorageMonitorBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storagemonitor.StorageMonitorContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.SimpleBlock; -import com.refinedmods.refinedstorage.platform.common.support.SimpleItem; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.SingleAmountData; -import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyLootItemFunction; -import com.refinedmods.refinedstorage.platform.common.support.network.BaseNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.support.network.component.PlatformStorageNetworkComponent; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceContainerInsertStrategy; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceFactory; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; -import com.refinedmods.refinedstorage.platform.common.support.slotreference.InventorySlotReferenceFactory; -import com.refinedmods.refinedstorage.platform.common.upgrade.FortuneUpgradeItem; -import com.refinedmods.refinedstorage.platform.common.upgrade.RangeUpgradeItem; -import com.refinedmods.refinedstorage.platform.common.upgrade.RegulatorUpgradeContainerMenu; -import com.refinedmods.refinedstorage.platform.common.upgrade.RegulatorUpgradeState; -import com.refinedmods.refinedstorage.platform.common.upgrade.SimpleUpgradeItem; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeWithEnchantedBookRecipeSerializer; -import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.BaseWirelessTransmitterRangeModifier; -import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.CreativeRangeUpgradeWirelessTransmitterRangeModifier; -import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.RangeUpgradeWirelessTransmitterRangeModifier; -import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.WirelessTransmitterBlockEntity; -import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.WirelessTransmitterContainerMenu; -import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.WirelessTransmitterData; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.PlatformApiProxy; +import com.refinedmods.refinedstorage.common.api.security.PlatformSecurityNetworkComponent; +import com.refinedmods.refinedstorage.common.api.upgrade.AbstractUpgradeItem; +import com.refinedmods.refinedstorage.common.configurationcard.ConfigurationCardItem; +import com.refinedmods.refinedstorage.common.configurationcard.ConfigurationCardState; +import com.refinedmods.refinedstorage.common.constructordestructor.BlockBreakDestructorStrategyFactory; +import com.refinedmods.refinedstorage.common.constructordestructor.ConstructorBlockEntity; +import com.refinedmods.refinedstorage.common.constructordestructor.ConstructorContainerMenu; +import com.refinedmods.refinedstorage.common.constructordestructor.DestructorBlockEntity; +import com.refinedmods.refinedstorage.common.constructordestructor.DestructorContainerMenu; +import com.refinedmods.refinedstorage.common.constructordestructor.FluidBreakDestructorStrategyFactory; +import com.refinedmods.refinedstorage.common.constructordestructor.ItemDropConstructorStrategyFactory; +import com.refinedmods.refinedstorage.common.constructordestructor.ItemPickupDestructorStrategyFactory; +import com.refinedmods.refinedstorage.common.constructordestructor.PlaceBlockConstructorStrategy; +import com.refinedmods.refinedstorage.common.constructordestructor.PlaceFireworksConstructorStrategy; +import com.refinedmods.refinedstorage.common.constructordestructor.PlaceFluidConstructorStrategy; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.BlockEntityTypeFactory; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.content.ContentIds; +import com.refinedmods.refinedstorage.common.content.DataComponents; +import com.refinedmods.refinedstorage.common.content.ExtendedMenuTypeFactory; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.common.content.LootFunctions; +import com.refinedmods.refinedstorage.common.content.MenuTypeFactory; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.content.RegistryCallback; +import com.refinedmods.refinedstorage.common.content.Sounds; +import com.refinedmods.refinedstorage.common.controller.ControllerBlockEntity; +import com.refinedmods.refinedstorage.common.controller.ControllerContainerMenu; +import com.refinedmods.refinedstorage.common.controller.ControllerData; +import com.refinedmods.refinedstorage.common.controller.ControllerType; +import com.refinedmods.refinedstorage.common.detector.DetectorBlockEntity; +import com.refinedmods.refinedstorage.common.detector.DetectorContainerMenu; +import com.refinedmods.refinedstorage.common.exporter.ExporterBlockEntity; +import com.refinedmods.refinedstorage.common.exporter.ExporterContainerMenu; +import com.refinedmods.refinedstorage.common.grid.CraftingGridBlockEntity; +import com.refinedmods.refinedstorage.common.grid.CraftingGridContainerMenu; +import com.refinedmods.refinedstorage.common.grid.GridBlockEntity; +import com.refinedmods.refinedstorage.common.grid.GridContainerMenu; +import com.refinedmods.refinedstorage.common.grid.GridData; +import com.refinedmods.refinedstorage.common.grid.PortableGridData; +import com.refinedmods.refinedstorage.common.grid.WirelessGridContainerMenu; +import com.refinedmods.refinedstorage.common.grid.WirelessGridData; +import com.refinedmods.refinedstorage.common.iface.InterfaceBlock; +import com.refinedmods.refinedstorage.common.iface.InterfaceBlockEntity; +import com.refinedmods.refinedstorage.common.iface.InterfaceContainerMenu; +import com.refinedmods.refinedstorage.common.iface.InterfaceData; +import com.refinedmods.refinedstorage.common.importer.ImporterBlockEntity; +import com.refinedmods.refinedstorage.common.importer.ImporterContainerMenu; +import com.refinedmods.refinedstorage.common.misc.ProcessorItem; +import com.refinedmods.refinedstorage.common.misc.WrenchItem; +import com.refinedmods.refinedstorage.common.networking.NetworkCardItem; +import com.refinedmods.refinedstorage.common.networking.NetworkReceiverBlockEntity; +import com.refinedmods.refinedstorage.common.networking.NetworkTransmitterBlockEntity; +import com.refinedmods.refinedstorage.common.networking.NetworkTransmitterContainerMenu; +import com.refinedmods.refinedstorage.common.networking.NetworkTransmitterData; +import com.refinedmods.refinedstorage.common.networking.RelayBlockEntity; +import com.refinedmods.refinedstorage.common.networking.RelayContainerMenu; +import com.refinedmods.refinedstorage.common.security.BuiltinPermission; +import com.refinedmods.refinedstorage.common.security.FallbackSecurityCardContainerMenu; +import com.refinedmods.refinedstorage.common.security.PlatformSecurityNetworkComponentImpl; +import com.refinedmods.refinedstorage.common.security.PlayerBoundSecurityCardData; +import com.refinedmods.refinedstorage.common.security.SecurityCardBoundPlayer; +import com.refinedmods.refinedstorage.common.security.SecurityCardContainerMenu; +import com.refinedmods.refinedstorage.common.security.SecurityCardData; +import com.refinedmods.refinedstorage.common.security.SecurityCardPermissions; +import com.refinedmods.refinedstorage.common.security.SecurityManagerBlockEntity; +import com.refinedmods.refinedstorage.common.security.SecurityManagerContainerMenu; +import com.refinedmods.refinedstorage.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.common.storage.ItemStorageVariant; +import com.refinedmods.refinedstorage.common.storage.StorageTypes; +import com.refinedmods.refinedstorage.common.storage.diskdrive.AbstractDiskDriveBlockEntity; +import com.refinedmods.refinedstorage.common.storage.diskdrive.DiskDriveBlock; +import com.refinedmods.refinedstorage.common.storage.diskdrive.DiskDriveContainerMenu; +import com.refinedmods.refinedstorage.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.common.storage.diskinterface.DiskInterfaceContainerMenu; +import com.refinedmods.refinedstorage.common.storage.externalstorage.ExternalStorageBlockEntity; +import com.refinedmods.refinedstorage.common.storage.externalstorage.ExternalStorageContainerMenu; +import com.refinedmods.refinedstorage.common.storage.portablegrid.AbstractPortableGridBlockEntity; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridBlock; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridBlockContainerMenu; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridItemContainerMenu; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridLootItemFunction; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridType; +import com.refinedmods.refinedstorage.common.storage.storageblock.FluidStorageBlock; +import com.refinedmods.refinedstorage.common.storage.storageblock.FluidStorageBlockBlockEntity; +import com.refinedmods.refinedstorage.common.storage.storageblock.FluidStorageBlockBlockItem; +import com.refinedmods.refinedstorage.common.storage.storageblock.FluidStorageBlockContainerMenu; +import com.refinedmods.refinedstorage.common.storage.storageblock.ItemStorageBlock; +import com.refinedmods.refinedstorage.common.storage.storageblock.ItemStorageBlockBlockEntity; +import com.refinedmods.refinedstorage.common.storage.storageblock.ItemStorageBlockBlockItem; +import com.refinedmods.refinedstorage.common.storage.storageblock.ItemStorageBlockContainerMenu; +import com.refinedmods.refinedstorage.common.storage.storageblock.StorageBlockData; +import com.refinedmods.refinedstorage.common.storage.storageblock.StorageBlockLootItemFunction; +import com.refinedmods.refinedstorage.common.storage.storagedisk.FluidStorageDiskItem; +import com.refinedmods.refinedstorage.common.storage.storagedisk.ItemStorageDiskItem; +import com.refinedmods.refinedstorage.common.storagemonitor.FluidStorageMonitorExtractionStrategy; +import com.refinedmods.refinedstorage.common.storagemonitor.FluidStorageMonitorInsertionStrategy; +import com.refinedmods.refinedstorage.common.storagemonitor.ItemStorageMonitorExtractionStrategy; +import com.refinedmods.refinedstorage.common.storagemonitor.ItemStorageMonitorInsertionStrategy; +import com.refinedmods.refinedstorage.common.storagemonitor.StorageMonitorBlock; +import com.refinedmods.refinedstorage.common.storagemonitor.StorageMonitorBlockEntity; +import com.refinedmods.refinedstorage.common.storagemonitor.StorageMonitorContainerMenu; +import com.refinedmods.refinedstorage.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.common.support.SimpleBlock; +import com.refinedmods.refinedstorage.common.support.SimpleItem; +import com.refinedmods.refinedstorage.common.support.containermenu.SingleAmountData; +import com.refinedmods.refinedstorage.common.support.energy.EnergyLootItemFunction; +import com.refinedmods.refinedstorage.common.support.network.BaseNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.support.network.component.PlatformStorageNetworkComponent; +import com.refinedmods.refinedstorage.common.support.resource.FluidResourceContainerInsertStrategy; +import com.refinedmods.refinedstorage.common.support.resource.FluidResourceFactory; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage.common.support.slotreference.InventorySlotReferenceFactory; +import com.refinedmods.refinedstorage.common.upgrade.FortuneUpgradeItem; +import com.refinedmods.refinedstorage.common.upgrade.RangeUpgradeItem; +import com.refinedmods.refinedstorage.common.upgrade.RegulatorUpgradeContainerMenu; +import com.refinedmods.refinedstorage.common.upgrade.RegulatorUpgradeState; +import com.refinedmods.refinedstorage.common.upgrade.SimpleUpgradeItem; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeWithEnchantedBookRecipeSerializer; +import com.refinedmods.refinedstorage.common.wirelesstransmitter.BaseWirelessTransmitterRangeModifier; +import com.refinedmods.refinedstorage.common.wirelesstransmitter.CreativeRangeUpgradeWirelessTransmitterRangeModifier; +import com.refinedmods.refinedstorage.common.wirelesstransmitter.RangeUpgradeWirelessTransmitterRangeModifier; +import com.refinedmods.refinedstorage.common.wirelesstransmitter.WirelessTransmitterBlockEntity; +import com.refinedmods.refinedstorage.common.wirelesstransmitter.WirelessTransmitterContainerMenu; +import com.refinedmods.refinedstorage.common.wirelesstransmitter.WirelessTransmitterData; import java.util.Optional; import java.util.UUID; @@ -161,54 +161,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.storage.loot.functions.LootItemFunctionType; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CABLE; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CONSTRUCTION_CORE; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CONSTRUCTOR; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CONTROLLER; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CRAFTING_GRID; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CREATIVE_CONTROLLER; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CREATIVE_PORTABLE_GRID; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.DESTRUCTION_CORE; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.DESTRUCTOR; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.DETECTOR; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.DISK_DRIVE; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.DISK_INTERFACE; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.EXPORTER; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.EXTERNAL_STORAGE; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.FALLBACK_SECURITY_CARD; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.FLUID_STORAGE_BLOCK; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.GRID; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.IMPORTER; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.INTERFACE; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.ITEM_STORAGE_BLOCK; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.MACHINE_CASING; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.NETWORK_RECEIVER; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.NETWORK_TRANSMITTER; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.PORTABLE_GRID; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.PROCESSOR_BINDING; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.QUARTZ_ENRICHED_COPPER; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.QUARTZ_ENRICHED_COPPER_BLOCK; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.QUARTZ_ENRICHED_IRON; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.QUARTZ_ENRICHED_IRON_BLOCK; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.REGULATOR_UPGRADE; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.RELAY; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.SECURITY_CARD; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.SECURITY_MANAGER; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.SILICON; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.STORAGE_BLOCK; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.STORAGE_HOUSING; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.STORAGE_MONITOR; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.WIRELESS_GRID; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.WIRELESS_TRANSMITTER; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.WRENCH; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.forFluidStorageBlock; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.forFluidStorageDisk; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.forFluidStoragePart; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.forItemStorageBlock; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.forItemStoragePart; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.forProcessor; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.forStorageDisk; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public abstract class AbstractModInitializer { private static final String ITEM_REGISTRY_KEY = "item"; @@ -330,21 +283,23 @@ protected final void registerBlocks( final BiFunction creativePortableGridBlockEntityFactory, final BiFunction diskInterfaceBlockEntityFactory ) { - Blocks.INSTANCE.setQuartzEnrichedIronBlock(callback.register(QUARTZ_ENRICHED_IRON_BLOCK, SimpleBlock::new)); - Blocks.INSTANCE.setQuartzEnrichedCopperBlock(callback.register(QUARTZ_ENRICHED_COPPER_BLOCK, SimpleBlock::new)); + Blocks.INSTANCE.setQuartzEnrichedIronBlock(callback.register( + ContentIds.QUARTZ_ENRICHED_IRON_BLOCK, SimpleBlock::new)); + Blocks.INSTANCE.setQuartzEnrichedCopperBlock( + callback.register(ContentIds.QUARTZ_ENRICHED_COPPER_BLOCK, SimpleBlock::new)); Blocks.INSTANCE.setDiskDrive( - callback.register(DISK_DRIVE, () -> new DiskDriveBlock(diskDriveBlockEntityFactory)) + callback.register(ContentIds.DISK_DRIVE, () -> new DiskDriveBlock(diskDriveBlockEntityFactory)) ); - Blocks.INSTANCE.setMachineCasing(callback.register(MACHINE_CASING, SimpleBlock::new)); + Blocks.INSTANCE.setMachineCasing(callback.register(ContentIds.MACHINE_CASING, SimpleBlock::new)); for (final ItemStorageVariant variant : ItemStorageVariant.values()) { Blocks.INSTANCE.setItemStorageBlock(variant, callback.register( - forItemStorageBlock(variant), + ContentIds.forItemStorageBlock(variant), () -> new ItemStorageBlock(variant) )); } for (final FluidStorageVariant variant : FluidStorageVariant.values()) { Blocks.INSTANCE.setFluidStorageBlock(variant, callback.register( - forFluidStorageBlock(variant), + ContentIds.forFluidStorageBlock(variant), () -> new FluidStorageBlock(variant) )); } @@ -359,19 +314,20 @@ protected final void registerBlocks( Blocks.INSTANCE.getExternalStorage().registerBlocks(callback); Blocks.INSTANCE.getConstructor().registerBlocks(callback); Blocks.INSTANCE.getDestructor().registerBlocks(callback); - Blocks.INSTANCE.setInterface(callback.register(INTERFACE, InterfaceBlock::new)); + Blocks.INSTANCE.setInterface(callback.register(ContentIds.INTERFACE, InterfaceBlock::new)); Blocks.INSTANCE.getWirelessTransmitter().registerBlocks(callback); - Blocks.INSTANCE.setStorageMonitor(callback.register(STORAGE_MONITOR, StorageMonitorBlock::new)); + Blocks.INSTANCE.setStorageMonitor(callback.register(ContentIds.STORAGE_MONITOR, StorageMonitorBlock::new)); Blocks.INSTANCE.getNetworkReceiver().registerBlocks(callback); Blocks.INSTANCE.getNetworkTransmitter().registerBlocks(callback); - Blocks.INSTANCE.setPortableGrid(callback.register(PORTABLE_GRID, () -> new PortableGridBlock( + Blocks.INSTANCE.setPortableGrid(callback.register(ContentIds.PORTABLE_GRID, () -> new PortableGridBlock( PortableGridType.NORMAL, portableGridBlockEntityFactory ))); - Blocks.INSTANCE.setCreativePortableGrid(callback.register(CREATIVE_PORTABLE_GRID, () -> new PortableGridBlock( - PortableGridType.CREATIVE, - creativePortableGridBlockEntityFactory - ))); + Blocks.INSTANCE.setCreativePortableGrid( + callback.register(ContentIds.CREATIVE_PORTABLE_GRID, () -> new PortableGridBlock( + PortableGridType.CREATIVE, + creativePortableGridBlockEntityFactory + ))); Blocks.INSTANCE.getSecurityManager().registerBlocks(callback); Blocks.INSTANCE.getRelay().registerBlocks(callback); Blocks.INSTANCE.setDiskInterface(diskInterfaceBlockEntityFactory).registerBlocks(callback); @@ -401,26 +357,26 @@ protected final void registerItems(final RegistryCallback callback) { } private void registerSimpleItems(final RegistryCallback callback) { - Items.INSTANCE.setQuartzEnrichedIron(callback.register(QUARTZ_ENRICHED_IRON, SimpleItem::new)); - Items.INSTANCE.setQuartzEnrichedCopper(callback.register(QUARTZ_ENRICHED_COPPER, SimpleItem::new)); + Items.INSTANCE.setQuartzEnrichedIron(callback.register(ContentIds.QUARTZ_ENRICHED_IRON, SimpleItem::new)); + Items.INSTANCE.setQuartzEnrichedCopper(callback.register(ContentIds.QUARTZ_ENRICHED_COPPER, SimpleItem::new)); callback.register( - QUARTZ_ENRICHED_IRON_BLOCK, + ContentIds.QUARTZ_ENRICHED_IRON_BLOCK, () -> new BaseBlockItem(Blocks.INSTANCE.getQuartzEnrichedIronBlock()) ); callback.register( - QUARTZ_ENRICHED_COPPER_BLOCK, + ContentIds.QUARTZ_ENRICHED_COPPER_BLOCK, () -> new BaseBlockItem(Blocks.INSTANCE.getQuartzEnrichedCopperBlock()) ); - Items.INSTANCE.setSilicon(callback.register(SILICON, SimpleItem::new)); - Items.INSTANCE.setProcessorBinding(callback.register(PROCESSOR_BINDING, SimpleItem::new)); - callback.register(DISK_DRIVE, () -> Blocks.INSTANCE.getDiskDrive().createBlockItem()); - Items.INSTANCE.setWrench(callback.register(WRENCH, WrenchItem::new)); - Items.INSTANCE.setStorageHousing(callback.register(STORAGE_HOUSING, SimpleItem::new)); - callback.register(MACHINE_CASING, () -> new BaseBlockItem(Blocks.INSTANCE.getMachineCasing())); - callback.register(STORAGE_MONITOR, () -> Blocks.INSTANCE.getStorageMonitor().createBlockItem()); - callback.register(INTERFACE, () -> Blocks.INSTANCE.getInterface().createBlockItem()); - Items.INSTANCE.setConstructionCore(callback.register(CONSTRUCTION_CORE, SimpleItem::new)); - Items.INSTANCE.setDestructionCore(callback.register(DESTRUCTION_CORE, SimpleItem::new)); + Items.INSTANCE.setSilicon(callback.register(ContentIds.SILICON, SimpleItem::new)); + Items.INSTANCE.setProcessorBinding(callback.register(ContentIds.PROCESSOR_BINDING, SimpleItem::new)); + callback.register(ContentIds.DISK_DRIVE, () -> Blocks.INSTANCE.getDiskDrive().createBlockItem()); + Items.INSTANCE.setWrench(callback.register(ContentIds.WRENCH, WrenchItem::new)); + Items.INSTANCE.setStorageHousing(callback.register(ContentIds.STORAGE_HOUSING, SimpleItem::new)); + callback.register(ContentIds.MACHINE_CASING, () -> new BaseBlockItem(Blocks.INSTANCE.getMachineCasing())); + callback.register(ContentIds.STORAGE_MONITOR, () -> Blocks.INSTANCE.getStorageMonitor().createBlockItem()); + callback.register(ContentIds.INTERFACE, () -> Blocks.INSTANCE.getInterface().createBlockItem()); + Items.INSTANCE.setConstructionCore(callback.register(ContentIds.CONSTRUCTION_CORE, SimpleItem::new)); + Items.INSTANCE.setDestructionCore(callback.register(ContentIds.DESTRUCTION_CORE, SimpleItem::new)); for (final ProcessorItem.Type type : ProcessorItem.Type.values()) { registerProcessor(callback, type); } @@ -432,7 +388,7 @@ private void registerSimpleItems(final RegistryCallback callback) { } private void registerProcessor(final RegistryCallback callback, final ProcessorItem.Type type) { - Items.INSTANCE.setProcessor(type, callback.register(forProcessor(type), ProcessorItem::new)); + Items.INSTANCE.setProcessor(type, callback.register(ContentIds.forProcessor(type), ProcessorItem::new)); } private void registerStorageItems(final RegistryCallback callback) { @@ -448,16 +404,16 @@ private void registerItemStorageItems(final RegistryCallback callback, final ItemStorageVariant variant) { if (variant != ItemStorageVariant.CREATIVE) { Items.INSTANCE.setItemStoragePart(variant, callback.register( - forItemStoragePart(variant), + ContentIds.forItemStoragePart(variant), SimpleItem::new) ); } Items.INSTANCE.setItemStorageDisk(variant, callback.register( - forStorageDisk(variant), + ContentIds.forStorageDisk(variant), () -> new ItemStorageDiskItem(variant) )); callback.register( - forItemStorageBlock(variant), + ContentIds.forItemStorageBlock(variant), () -> new ItemStorageBlockBlockItem(Blocks.INSTANCE.getItemStorageBlock(variant), variant) ); } @@ -466,16 +422,16 @@ private void registerFluidStorageItems(final RegistryCallback callback, final FluidStorageVariant variant) { if (variant != FluidStorageVariant.CREATIVE) { Items.INSTANCE.setFluidStoragePart(variant, callback.register( - forFluidStoragePart(variant), + ContentIds.forFluidStoragePart(variant), SimpleItem::new) ); } Items.INSTANCE.setFluidStorageDisk(variant, callback.register( - forFluidStorageDisk(variant), + ContentIds.forFluidStorageDisk(variant), () -> new FluidStorageDiskItem(variant) )); callback.register( - forFluidStorageBlock(variant), + ContentIds.forFluidStorageBlock(variant), () -> new FluidStorageBlockBlockItem(Blocks.INSTANCE.getFluidStorageBlock(variant), variant) ); } @@ -568,7 +524,7 @@ protected final void registerBlockEntities( diskInterfaceBlockEntitySupplier ) { BlockEntities.INSTANCE.setCable(callback.register( - CABLE, + ContentIds.CABLE, () -> typeFactory.create((pos, state) -> new BaseNetworkNodeContainerBlockEntity<>( BlockEntities.INSTANCE.getCable(), pos, @@ -577,34 +533,34 @@ protected final void registerBlockEntities( ), Blocks.INSTANCE.getCable().toArray()) )); BlockEntities.INSTANCE.setController(callback.register( - CONTROLLER, + ContentIds.CONTROLLER, () -> typeFactory.create( (pos, state) -> new ControllerBlockEntity(ControllerType.NORMAL, pos, state), Blocks.INSTANCE.getController().toArray() ) )); BlockEntities.INSTANCE.setCreativeController(callback.register( - CREATIVE_CONTROLLER, + ContentIds.CREATIVE_CONTROLLER, () -> typeFactory.create( (pos, state) -> new ControllerBlockEntity(ControllerType.CREATIVE, pos, state), Blocks.INSTANCE.getCreativeController().toArray() ) )); BlockEntities.INSTANCE.setDiskDrive(callback.register( - DISK_DRIVE, + ContentIds.DISK_DRIVE, () -> typeFactory.create(diskDriveBlockEntitySupplier, Blocks.INSTANCE.getDiskDrive()) )); BlockEntities.INSTANCE.setGrid(callback.register( - GRID, + ContentIds.GRID, () -> typeFactory.create(GridBlockEntity::new, Blocks.INSTANCE.getGrid().toArray()) )); BlockEntities.INSTANCE.setCraftingGrid(callback.register( - CRAFTING_GRID, + ContentIds.CRAFTING_GRID, () -> typeFactory.create(CraftingGridBlockEntity::new, Blocks.INSTANCE.getCraftingGrid().toArray()) )); for (final ItemStorageVariant variant : ItemStorageVariant.values()) { BlockEntities.INSTANCE.setItemStorageBlock(variant, callback.register( - forItemStorageBlock(variant), + ContentIds.forItemStorageBlock(variant), () -> typeFactory.create( (pos, state) -> new ItemStorageBlockBlockEntity(pos, state, variant), Blocks.INSTANCE.getItemStorageBlock(variant) @@ -613,7 +569,7 @@ protected final void registerBlockEntities( } for (final FluidStorageVariant variant : FluidStorageVariant.values()) { BlockEntities.INSTANCE.setFluidStorageBlock(variant, callback.register( - forFluidStorageBlock(variant), + ContentIds.forFluidStorageBlock(variant), () -> typeFactory.create( (pos, state) -> new FluidStorageBlockBlockEntity(pos, state, variant), Blocks.INSTANCE.getFluidStorageBlock(variant) @@ -621,81 +577,81 @@ protected final void registerBlockEntities( )); } BlockEntities.INSTANCE.setImporter(callback.register( - IMPORTER, + ContentIds.IMPORTER, () -> typeFactory.create(ImporterBlockEntity::new, Blocks.INSTANCE.getImporter().toArray()) )); BlockEntities.INSTANCE.setExporter(callback.register( - EXPORTER, + ContentIds.EXPORTER, () -> typeFactory.create(ExporterBlockEntity::new, Blocks.INSTANCE.getExporter().toArray()) )); BlockEntities.INSTANCE.setInterface(callback.register( - INTERFACE, + ContentIds.INTERFACE, () -> typeFactory.create(InterfaceBlockEntity::new, Blocks.INSTANCE.getInterface()) )); BlockEntities.INSTANCE.setExternalStorage(callback.register( - EXTERNAL_STORAGE, + ContentIds.EXTERNAL_STORAGE, () -> typeFactory.create(ExternalStorageBlockEntity::new, Blocks.INSTANCE.getExternalStorage().toArray()) )); BlockEntities.INSTANCE.setDetector(callback.register( - DETECTOR, + ContentIds.DETECTOR, () -> typeFactory.create(DetectorBlockEntity::new, Blocks.INSTANCE.getDetector().toArray()) )); BlockEntities.INSTANCE.setConstructor(callback.register( - CONSTRUCTOR, + ContentIds.CONSTRUCTOR, () -> typeFactory.create(ConstructorBlockEntity::new, Blocks.INSTANCE.getConstructor().toArray()) )); BlockEntities.INSTANCE.setDestructor(callback.register( - DESTRUCTOR, + ContentIds.DESTRUCTOR, () -> typeFactory.create(DestructorBlockEntity::new, Blocks.INSTANCE.getDestructor().toArray()) )); BlockEntities.INSTANCE.setWirelessTransmitter(callback.register( - WIRELESS_TRANSMITTER, + ContentIds.WIRELESS_TRANSMITTER, () -> typeFactory.create( WirelessTransmitterBlockEntity::new, Blocks.INSTANCE.getWirelessTransmitter().toArray() ) )); BlockEntities.INSTANCE.setStorageMonitor(callback.register( - STORAGE_MONITOR, + ContentIds.STORAGE_MONITOR, () -> typeFactory.create(StorageMonitorBlockEntity::new, Blocks.INSTANCE.getStorageMonitor()) )); BlockEntities.INSTANCE.setNetworkReceiver(callback.register( - NETWORK_RECEIVER, + ContentIds.NETWORK_RECEIVER, () -> typeFactory.create(NetworkReceiverBlockEntity::new, Blocks.INSTANCE.getNetworkReceiver().toArray()) )); BlockEntities.INSTANCE.setNetworkTransmitter(callback.register( - NETWORK_TRANSMITTER, + ContentIds.NETWORK_TRANSMITTER, () -> typeFactory.create( NetworkTransmitterBlockEntity::new, Blocks.INSTANCE.getNetworkTransmitter().toArray() ) )); BlockEntities.INSTANCE.setPortableGrid(callback.register( - PORTABLE_GRID, + ContentIds.PORTABLE_GRID, () -> typeFactory.create(portableGridBlockEntitySupplier::create, Blocks.INSTANCE.getPortableGrid()) )); BlockEntities.INSTANCE.setCreativePortableGrid(callback.register( - CREATIVE_PORTABLE_GRID, + ContentIds.CREATIVE_PORTABLE_GRID, () -> typeFactory.create( creativePortableGridBlockEntitySupplier::create, Blocks.INSTANCE.getCreativePortableGrid() ) )); BlockEntities.INSTANCE.setSecurityManager(callback.register( - SECURITY_MANAGER, + ContentIds.SECURITY_MANAGER, () -> typeFactory.create( SecurityManagerBlockEntity::new, Blocks.INSTANCE.getSecurityManager().toArray() ) )); BlockEntities.INSTANCE.setRelay(callback.register( - RELAY, + ContentIds.RELAY, () -> typeFactory.create(RelayBlockEntity::new, Blocks.INSTANCE.getRelay().toArray()) )); BlockEntities.INSTANCE.setDiskInterface(callback.register( - DISK_INTERFACE, + ContentIds.DISK_INTERFACE, () -> typeFactory.create(diskInterfaceBlockEntitySupplier, Blocks.INSTANCE.getDiskInterface().toArray()) )); } @@ -704,76 +660,76 @@ protected final void registerMenus(final RegistryCallback> callback, final MenuTypeFactory menuTypeFactory, final ExtendedMenuTypeFactory extendedMenuTypeFactory) { Menus.INSTANCE.setController(callback.register( - CONTROLLER, + ContentIds.CONTROLLER, () -> extendedMenuTypeFactory.create(ControllerContainerMenu::new, ControllerData.STREAM_CODEC) )); Menus.INSTANCE.setDiskDrive(callback.register( - DISK_DRIVE, + ContentIds.DISK_DRIVE, () -> extendedMenuTypeFactory.create(DiskDriveContainerMenu::new, ResourceContainerData.STREAM_CODEC) )); Menus.INSTANCE.setGrid(callback.register( - GRID, + ContentIds.GRID, () -> extendedMenuTypeFactory.create(GridContainerMenu::new, GridData.STREAM_CODEC) )); Menus.INSTANCE.setCraftingGrid(callback.register( - CRAFTING_GRID, + ContentIds.CRAFTING_GRID, () -> extendedMenuTypeFactory.create(CraftingGridContainerMenu::new, GridData.STREAM_CODEC) )); Menus.INSTANCE.setWirelessGrid(callback.register( - WIRELESS_GRID, + ContentIds.WIRELESS_GRID, () -> extendedMenuTypeFactory.create(WirelessGridContainerMenu::new, WirelessGridData.STREAM_CODEC) )); Menus.INSTANCE.setItemStorage(callback.register( - ITEM_STORAGE_BLOCK, + ContentIds.ITEM_STORAGE_BLOCK, () -> extendedMenuTypeFactory.create(ItemStorageBlockContainerMenu::new, StorageBlockData.STREAM_CODEC) )); Menus.INSTANCE.setFluidStorage(callback.register( - FLUID_STORAGE_BLOCK, + ContentIds.FLUID_STORAGE_BLOCK, () -> extendedMenuTypeFactory.create(FluidStorageBlockContainerMenu::new, StorageBlockData.STREAM_CODEC) )); Menus.INSTANCE.setImporter(callback.register( - IMPORTER, + ContentIds.IMPORTER, () -> extendedMenuTypeFactory.create(ImporterContainerMenu::new, ResourceContainerData.STREAM_CODEC) )); Menus.INSTANCE.setExporter(callback.register( - EXPORTER, + ContentIds.EXPORTER, () -> extendedMenuTypeFactory.create(ExporterContainerMenu::new, ResourceContainerData.STREAM_CODEC) )); Menus.INSTANCE.setInterface(callback.register( - INTERFACE, + ContentIds.INTERFACE, () -> extendedMenuTypeFactory.create(InterfaceContainerMenu::new, InterfaceData.STREAM_CODEC) )); Menus.INSTANCE.setExternalStorage(callback.register( - EXTERNAL_STORAGE, + ContentIds.EXTERNAL_STORAGE, () -> extendedMenuTypeFactory.create(ExternalStorageContainerMenu::new, ResourceContainerData.STREAM_CODEC) )); Menus.INSTANCE.setDetector(callback.register( - DETECTOR, + ContentIds.DETECTOR, () -> extendedMenuTypeFactory.create(DetectorContainerMenu::new, SingleAmountData.STREAM_CODEC) )); Menus.INSTANCE.setDestructor(callback.register( - DESTRUCTOR, + ContentIds.DESTRUCTOR, () -> extendedMenuTypeFactory.create(DestructorContainerMenu::new, ResourceContainerData.STREAM_CODEC) )); Menus.INSTANCE.setConstructor(callback.register( - CONSTRUCTOR, + ContentIds.CONSTRUCTOR, () -> extendedMenuTypeFactory.create(ConstructorContainerMenu::new, ResourceContainerData.STREAM_CODEC) )); Menus.INSTANCE.setRegulatorUpgrade(callback.register( - REGULATOR_UPGRADE, + ContentIds.REGULATOR_UPGRADE, () -> extendedMenuTypeFactory.create(RegulatorUpgradeContainerMenu::new, SingleAmountData.STREAM_CODEC) )); Menus.INSTANCE.setWirelessTransmitter(callback.register( - WIRELESS_TRANSMITTER, + ContentIds.WIRELESS_TRANSMITTER, () -> extendedMenuTypeFactory.create(WirelessTransmitterContainerMenu::new, WirelessTransmitterData.STREAM_CODEC) )); Menus.INSTANCE.setStorageMonitor(callback.register( - STORAGE_MONITOR, + ContentIds.STORAGE_MONITOR, () -> extendedMenuTypeFactory.create(StorageMonitorContainerMenu::new, ResourceContainerData.STREAM_CODEC) )); Menus.INSTANCE.setNetworkTransmitter(callback.register( - NETWORK_TRANSMITTER, + ContentIds.NETWORK_TRANSMITTER, () -> extendedMenuTypeFactory.create(NetworkTransmitterContainerMenu::new, NetworkTransmitterData.STREAM_CODEC) )); @@ -786,35 +742,35 @@ protected final void registerMenus(final RegistryCallback> callback, () -> extendedMenuTypeFactory.create(PortableGridItemContainerMenu::new, PortableGridData.STREAM_CODEC) )); Menus.INSTANCE.setSecurityCard(callback.register( - SECURITY_CARD, + ContentIds.SECURITY_CARD, () -> extendedMenuTypeFactory.create(SecurityCardContainerMenu::new, PlayerBoundSecurityCardData.STREAM_CODEC) )); Menus.INSTANCE.setFallbackSecurityCard(callback.register( - FALLBACK_SECURITY_CARD, + ContentIds.FALLBACK_SECURITY_CARD, () -> extendedMenuTypeFactory.create(FallbackSecurityCardContainerMenu::new, SecurityCardData.STREAM_CODEC) )); Menus.INSTANCE.setSecurityManager(callback.register( - SECURITY_MANAGER, + ContentIds.SECURITY_MANAGER, () -> menuTypeFactory.create(SecurityManagerContainerMenu::new) )); Menus.INSTANCE.setRelay(callback.register( - RELAY, + ContentIds.RELAY, () -> extendedMenuTypeFactory.create(RelayContainerMenu::new, ResourceContainerData.STREAM_CODEC) )); Menus.INSTANCE.setDiskInterface(callback.register( - DISK_INTERFACE, + ContentIds.DISK_INTERFACE, () -> extendedMenuTypeFactory.create(DiskInterfaceContainerMenu::new, ResourceContainerData.STREAM_CODEC) )); } protected final void registerLootFunctions(final RegistryCallback> callback) { LootFunctions.INSTANCE.setStorageBlock(callback.register( - STORAGE_BLOCK, + ContentIds.STORAGE_BLOCK, () -> new LootItemFunctionType<>(MapCodec.unit(new StorageBlockLootItemFunction())) )); LootFunctions.INSTANCE.setPortableGrid(callback.register( - PORTABLE_GRID, + ContentIds.PORTABLE_GRID, () -> new LootItemFunctionType<>(MapCodec.unit(new PortableGridLootItemFunction())) )); LootFunctions.INSTANCE.setEnergy(callback.register( @@ -825,8 +781,8 @@ protected final void registerLootFunctions(final RegistryCallback callback) { Sounds.INSTANCE.setWrench(callback.register( - WRENCH, - () -> SoundEvent.createVariableRangeEvent(WRENCH) + ContentIds.WRENCH, + () -> SoundEvent.createVariableRangeEvent(ContentIds.WRENCH) )); } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractPlatform.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractPlatform.java similarity index 75% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractPlatform.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractPlatform.java index 7f90c8e2d..468d9b6ab 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractPlatform.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractPlatform.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common; +package com.refinedmods.refinedstorage.common; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategyFactory; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.MenuOpener; -import com.refinedmods.refinedstorage.platform.common.support.render.FluidRenderer; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategyFactory; +import com.refinedmods.refinedstorage.common.support.containermenu.MenuOpener; +import com.refinedmods.refinedstorage.common.support.render.FluidRenderer; public abstract class AbstractPlatform implements Platform { private final MenuOpener menuOpener; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Config.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/Config.java similarity index 93% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Config.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/Config.java index c9c1f19bc..e828d1c07 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Config.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/Config.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common; +package com.refinedmods.refinedstorage.common; import com.refinedmods.refinedstorage.api.grid.view.GridSortingDirection; -import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridMatrixCloseBehavior; -import com.refinedmods.refinedstorage.platform.common.grid.GridSortingTypes; -import com.refinedmods.refinedstorage.platform.common.support.stretching.ScreenSize; +import com.refinedmods.refinedstorage.common.grid.CraftingGridMatrixCloseBehavior; +import com.refinedmods.refinedstorage.common.grid.GridSortingTypes; +import com.refinedmods.refinedstorage.common.support.stretching.ScreenSize; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Platform.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/Platform.java similarity index 87% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Platform.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/Platform.java index 80e778851..40e62c80f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Platform.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/Platform.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.common; +package com.refinedmods.refinedstorage.common; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.support.resource.FluidOperationResult; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.MenuOpener; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferManager; -import com.refinedmods.refinedstorage.platform.common.support.render.FluidRenderer; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategyFactory; +import com.refinedmods.refinedstorage.common.api.support.resource.FluidOperationResult; +import com.refinedmods.refinedstorage.common.support.containermenu.MenuOpener; +import com.refinedmods.refinedstorage.common.support.containermenu.TransferManager; +import com.refinedmods.refinedstorage.common.support.render.FluidRenderer; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.io.File; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformApiImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformApiImpl.java similarity index 75% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformApiImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformApiImpl.java index 4230c39e5..f8f85d2ca 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformApiImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformApiImpl.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common; +package com.refinedmods.refinedstorage.common; import com.refinedmods.refinedstorage.api.core.component.ComponentMapFactory; import com.refinedmods.refinedstorage.api.network.Network; @@ -10,76 +10,77 @@ import com.refinedmods.refinedstorage.api.network.node.NetworkNode; import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.ConstructorStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.exporter.ExporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHint; -import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHints; -import com.refinedmods.refinedstorage.platform.api.grid.GridSynchronizer; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.importer.ImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.security.BuiltinPermissions; -import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItemHelper; -import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage.platform.api.storage.StorageType; -import com.refinedmods.refinedstorage.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; -import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorExtractionStrategy; -import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorInsertionStrategy; -import com.refinedmods.refinedstorage.platform.api.support.energy.EnergyItemHelper; -import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionLogic; -import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage.platform.api.support.network.NetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemHelper; -import com.refinedmods.refinedstorage.platform.api.support.registry.PlatformRegistry; -import com.refinedmods.refinedstorage.platform.api.support.resource.RecipeModIngredientConverter; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainerInsertStrategy; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceRendering; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceFactory; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceProvider; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; -import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; -import com.refinedmods.refinedstorage.platform.common.grid.NoopGridSynchronizer; -import com.refinedmods.refinedstorage.platform.common.grid.screen.hint.GridInsertionHintsImpl; -import com.refinedmods.refinedstorage.platform.common.grid.screen.hint.ItemGridInsertionHint; -import com.refinedmods.refinedstorage.platform.common.grid.screen.hint.SingleItemGridInsertionHint; -import com.refinedmods.refinedstorage.platform.common.grid.strategy.CompositeGridExtractionStrategy; -import com.refinedmods.refinedstorage.platform.common.grid.strategy.CompositeGridInsertionStrategy; -import com.refinedmods.refinedstorage.platform.common.grid.strategy.CompositeGridScrollingStrategy; -import com.refinedmods.refinedstorage.platform.common.security.BuiltinPermission; -import com.refinedmods.refinedstorage.platform.common.storage.ClientStorageRepository; -import com.refinedmods.refinedstorage.platform.common.storage.StorageContainerItemHelperImpl; -import com.refinedmods.refinedstorage.platform.common.storage.StorageRepositoryImpl; -import com.refinedmods.refinedstorage.platform.common.storage.StorageTypes; -import com.refinedmods.refinedstorage.platform.common.storagemonitor.CompositeStorageMonitorExtractionStrategy; -import com.refinedmods.refinedstorage.platform.common.storagemonitor.CompositeStorageMonitorInsertionStrategy; -import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyItemHelperImpl; -import com.refinedmods.refinedstorage.platform.common.support.energy.ItemBlockEnergyStorage; -import com.refinedmods.refinedstorage.platform.common.support.energy.ItemEnergyStorage; -import com.refinedmods.refinedstorage.platform.common.support.network.ConnectionProviderImpl; -import com.refinedmods.refinedstorage.platform.common.support.network.InWorldNetworkNodeContainerImpl; -import com.refinedmods.refinedstorage.platform.common.support.network.bounditem.NetworkBoundItemHelperImpl; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.S2CPackets; -import com.refinedmods.refinedstorage.platform.common.support.registry.PlatformRegistryImpl; -import com.refinedmods.refinedstorage.platform.common.support.resource.CompositeRecipeModIngredientConverter; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceFactory; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResourceFactory; -import com.refinedmods.refinedstorage.platform.common.support.slotreference.CompositeSlotReferenceProvider; -import com.refinedmods.refinedstorage.platform.common.support.slotreference.InventorySlotReference; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeRegistryImpl; -import com.refinedmods.refinedstorage.platform.common.util.ServerEventQueue; -import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.CompositeWirelessTransmitterRangeModifier; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.constructordestructor.ConstructorStrategyFactory; +import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategyFactory; +import com.refinedmods.refinedstorage.common.api.exporter.ExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.grid.GridInsertionHint; +import com.refinedmods.refinedstorage.common.api.grid.GridInsertionHints; +import com.refinedmods.refinedstorage.common.api.grid.GridSynchronizer; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategyFactory; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategyFactory; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategyFactory; +import com.refinedmods.refinedstorage.common.api.importer.ImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.api.security.BuiltinPermissions; +import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.common.api.storage.StorageContainerItemHelper; +import com.refinedmods.refinedstorage.common.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.common.api.storage.StorageType; +import com.refinedmods.refinedstorage.common.api.storage.externalstorage.PlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorExtractionStrategy; +import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorInsertionStrategy; +import com.refinedmods.refinedstorage.common.api.support.energy.EnergyItemHelper; +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionLogic; +import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemHelper; +import com.refinedmods.refinedstorage.common.api.support.registry.PlatformRegistry; +import com.refinedmods.refinedstorage.common.api.support.resource.RecipeModIngredientConverter; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainerInsertStrategy; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceFactory; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceRendering; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceFactory; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceProvider; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeRegistry; +import com.refinedmods.refinedstorage.common.api.wirelesstransmitter.WirelessTransmitterRangeModifier; +import com.refinedmods.refinedstorage.common.grid.NoopGridSynchronizer; +import com.refinedmods.refinedstorage.common.grid.screen.hint.GridInsertionHintsImpl; +import com.refinedmods.refinedstorage.common.grid.screen.hint.ItemGridInsertionHint; +import com.refinedmods.refinedstorage.common.grid.screen.hint.SingleItemGridInsertionHint; +import com.refinedmods.refinedstorage.common.grid.strategy.CompositeGridExtractionStrategy; +import com.refinedmods.refinedstorage.common.grid.strategy.CompositeGridInsertionStrategy; +import com.refinedmods.refinedstorage.common.grid.strategy.CompositeGridScrollingStrategy; +import com.refinedmods.refinedstorage.common.security.BuiltinPermission; +import com.refinedmods.refinedstorage.common.storage.ClientStorageRepository; +import com.refinedmods.refinedstorage.common.storage.StorageContainerItemHelperImpl; +import com.refinedmods.refinedstorage.common.storage.StorageRepositoryImpl; +import com.refinedmods.refinedstorage.common.storage.StorageTypes; +import com.refinedmods.refinedstorage.common.storagemonitor.CompositeStorageMonitorExtractionStrategy; +import com.refinedmods.refinedstorage.common.storagemonitor.CompositeStorageMonitorInsertionStrategy; +import com.refinedmods.refinedstorage.common.support.energy.EnergyItemHelperImpl; +import com.refinedmods.refinedstorage.common.support.energy.ItemBlockEnergyStorage; +import com.refinedmods.refinedstorage.common.support.energy.ItemEnergyStorage; +import com.refinedmods.refinedstorage.common.support.network.ConnectionProviderImpl; +import com.refinedmods.refinedstorage.common.support.network.InWorldNetworkNodeContainerImpl; +import com.refinedmods.refinedstorage.common.support.network.bounditem.NetworkBoundItemHelperImpl; +import com.refinedmods.refinedstorage.common.support.packet.c2s.C2SPackets; +import com.refinedmods.refinedstorage.common.support.packet.s2c.S2CPackets; +import com.refinedmods.refinedstorage.common.support.registry.PlatformRegistryImpl; +import com.refinedmods.refinedstorage.common.support.resource.CompositeRecipeModIngredientConverter; +import com.refinedmods.refinedstorage.common.support.resource.FluidResourceFactory; +import com.refinedmods.refinedstorage.common.support.resource.ItemResourceFactory; +import com.refinedmods.refinedstorage.common.support.slotreference.CompositeSlotReferenceProvider; +import com.refinedmods.refinedstorage.common.support.slotreference.InventorySlotReference; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeRegistryImpl; +import com.refinedmods.refinedstorage.common.util.IdentifierUtil; +import com.refinedmods.refinedstorage.common.util.ServerEventQueue; +import com.refinedmods.refinedstorage.common.wirelesstransmitter.CompositeWirelessTransmitterRangeModifier; import java.util.ArrayList; import java.util.Arrays; @@ -114,8 +115,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.saveddata.SavedData; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; import static java.util.Objects.requireNonNull; public class PlatformApiImpl implements PlatformApi { @@ -549,7 +549,7 @@ public SecurityPolicy createDefaultSecurityPolicy() { @Override public void sendNoPermissionToOpenMessage(final ServerPlayer player, final Component target) { - sendNoPermissionMessage(player, createTranslation("misc", "no_permission.open", target)); + sendNoPermissionMessage(player, IdentifierUtil.createTranslation("misc", "no_permission.open", target)); } @Override @@ -571,7 +571,7 @@ public boolean canPlaceNetworkNode(final ServerPlayer player, if (!adjacentContainerBlockEntity.canBuild(player)) { PlatformApi.INSTANCE.sendNoPermissionMessage( player, - createTranslation("misc", "no_permission.build.place", state.getBlock().getName()) + IdentifierUtil.createTranslation("misc", "no_permission.build.place", state.getBlock().getName()) ); return false; } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformProxy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformProxy.java similarity index 92% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformProxy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformProxy.java index 26da46da9..517fc306b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformProxy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformProxy.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.common; +package com.refinedmods.refinedstorage.common; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.support.resource.FluidOperationResult; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.MenuOpener; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferManager; -import com.refinedmods.refinedstorage.platform.common.support.render.FluidRenderer; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategyFactory; +import com.refinedmods.refinedstorage.common.api.support.resource.FluidOperationResult; +import com.refinedmods.refinedstorage.common.support.containermenu.MenuOpener; +import com.refinedmods.refinedstorage.common.support.containermenu.TransferManager; +import com.refinedmods.refinedstorage.common.support.render.FluidRenderer; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.io.File; import java.util.List; @@ -53,7 +53,7 @@ public class PlatformProxy implements Platform { private Platform platform; public static void loadPlatform(final Platform platform) { - final PlatformProxy proxy = (PlatformProxy) Platform.INSTANCE; + final PlatformProxy proxy = (PlatformProxy) INSTANCE; if (proxy.platform != null) { throw new IllegalStateException("Platform already set"); } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/configurationcard/ConfigurationCardItem.java similarity index 94% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/configurationcard/ConfigurationCardItem.java index 9ee6ccfd9..d34df1ed5 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/configurationcard/ConfigurationCardItem.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.configurationcard; +package com.refinedmods.refinedstorage.common.configurationcard; -import com.refinedmods.refinedstorage.platform.api.configurationcard.ConfigurationCardTarget; -import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.content.DataComponents; +import com.refinedmods.refinedstorage.common.api.configurationcard.ConfigurationCardTarget; +import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.common.content.DataComponents; import java.util.List; import java.util.Optional; @@ -28,7 +28,7 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class ConfigurationCardItem extends Item { private static final Component EMPTY_HELP = createTranslation("item", "configuration_card.empty_help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardItemPropertyFunction.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/configurationcard/ConfigurationCardItemPropertyFunction.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardItemPropertyFunction.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/configurationcard/ConfigurationCardItemPropertyFunction.java index f1a7e3e40..f2d6ef6f2 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardItemPropertyFunction.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/configurationcard/ConfigurationCardItemPropertyFunction.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.configurationcard; +package com.refinedmods.refinedstorage.common.configurationcard; import javax.annotation.Nullable; @@ -8,7 +8,7 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public class ConfigurationCardItemPropertyFunction implements ClampedItemPropertyFunction { public static final ResourceLocation NAME = createIdentifier("configuration_card_active"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardState.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/configurationcard/ConfigurationCardState.java similarity index 96% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardState.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/configurationcard/ConfigurationCardState.java index 974d2cc57..33e3bccfd 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardState.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/configurationcard/ConfigurationCardState.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.configurationcard; +package com.refinedmods.refinedstorage.common.configurationcard; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/configurationcard/package-info.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/package-info.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/configurationcard/package-info.java index ae767a442..e470edfda 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/package-info.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/configurationcard/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.exporter; +package com.refinedmods.refinedstorage.common.configurationcard; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/AbstractConstructorDestructorBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractConstructorDestructorBlock.java similarity index 86% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/AbstractConstructorDestructorBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractConstructorDestructorBlock.java index 37d2cd2b2..5c66e1589 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/AbstractConstructorDestructorBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractConstructorDestructorBlock.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalCableBlock; -import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage.platform.common.support.ColorableBlock; -import com.refinedmods.refinedstorage.platform.common.support.DirectionalCableBlockShapes; +import com.refinedmods.refinedstorage.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.AbstractDirectionalCableBlock; +import com.refinedmods.refinedstorage.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.common.support.ColorableBlock; +import com.refinedmods.refinedstorage.common.support.DirectionalCableBlockShapes; import java.util.HashMap; import java.util.Map; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/AbstractItemConstructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractItemConstructorStrategy.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/AbstractItemConstructorStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractItemConstructorStrategy.java index ce2c3463e..40d159c4c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/AbstractItemConstructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractItemConstructorStrategy.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.Network; @@ -6,8 +6,8 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.ConstructorStrategy; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.api.constructordestructor.ConstructorStrategy; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/BlockBreakDestructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/BlockBreakDestructorStrategy.java similarity index 93% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/BlockBreakDestructorStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/BlockBreakDestructorStrategy.java index ced1d2bd1..c03b343ce 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/BlockBreakDestructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/BlockBreakDestructorStrategy.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.Network; @@ -6,9 +6,9 @@ import com.refinedmods.refinedstorage.api.resource.filter.Filter; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategy; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategy; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.util.List; import java.util.function.Supplier; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/BlockBreakDestructorStrategyFactory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/BlockBreakDestructorStrategyFactory.java similarity index 83% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/BlockBreakDestructorStrategyFactory.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/BlockBreakDestructorStrategyFactory.java index 33c67f04a..91035a9e9 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/BlockBreakDestructorStrategyFactory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/BlockBreakDestructorStrategyFactory.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategy; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeItem; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategy; +import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategyFactory; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeItem; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.common.content.Items; import java.util.List; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/CompositeConstructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/CompositeConstructorStrategy.java similarity index 85% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/CompositeConstructorStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/CompositeConstructorStrategy.java index f8bac9b87..cfcae4456 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/CompositeConstructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/CompositeConstructorStrategy.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.ConstructorStrategy; +import com.refinedmods.refinedstorage.common.api.constructordestructor.ConstructorStrategy; import java.util.Collections; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/CompositeDestructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/CompositeDestructorStrategy.java similarity index 85% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/CompositeDestructorStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/CompositeDestructorStrategy.java index 76fc966c0..3320e7af6 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/CompositeDestructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/CompositeDestructorStrategy.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.resource.filter.Filter; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategy; +import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategy; import java.util.Collections; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorBlock.java similarity index 63% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorBlock.java index 99658bcaf..f3777361a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorBlock.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker; import javax.annotation.Nullable; @@ -17,7 +17,7 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class ConstructorBlock extends AbstractConstructorDestructorBlock< ConstructorBlock, ConstructorBlockEntity, BaseBlockItem diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorBlockEntity.java similarity index 87% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorBlockEntity.java index 5a35a2bfc..61e4d20ae 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorBlockEntity.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; @@ -7,15 +7,15 @@ import com.refinedmods.refinedstorage.api.network.node.task.TaskExecutor; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.ConstructorStrategy; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.ConstructorStrategyFactory; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.network.AbstractSchedulingNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.constructordestructor.ConstructorStrategy; +import com.refinedmods.refinedstorage.common.api.constructordestructor.ConstructorStrategyFactory; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.network.AbstractSchedulingNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations; import java.util.ArrayList; import java.util.Collection; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorContainerMenu.java similarity index 68% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorContainerMenu.java index 4406b8c09..2ba899e2b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorContainerMenu.java @@ -1,19 +1,19 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractSchedulingContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.support.containermenu.AbstractSchedulingContainerMenu; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class ConstructorContainerMenu extends AbstractSchedulingContainerMenu { private static final MutableComponent FILTER_HELP = createTranslation("gui", "constructor.filter_help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorDestructorPropertyTypes.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorDestructorPropertyTypes.java similarity index 51% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorDestructorPropertyTypes.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorDestructorPropertyTypes.java index f81b1cd8a..b8c22724e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorDestructorPropertyTypes.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorDestructorPropertyTypes.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyType; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyType; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; final class ConstructorDestructorPropertyTypes { static final PropertyType PICKUP_ITEMS = PropertyTypes.createBooleanProperty( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorDropItemsSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorDropItemsSideButtonWidget.java similarity index 54% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorDropItemsSideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorDropItemsSideButtonWidget.java index a9b5917c5..f27231ee6 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorDropItemsSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorDropItemsSideButtonWidget.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractYesNoSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.widget.AbstractYesNoSideButtonWidget; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; class ConstructorDropItemsSideButtonWidget extends AbstractYesNoSideButtonWidget { ConstructorDropItemsSideButtonWidget(final ClientProperty property) { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorScreen.java similarity index 68% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorScreen.java index 6ed01109e..d1b35c126 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorScreen.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; -import com.refinedmods.refinedstorage.platform.common.support.AbstractFilterScreen; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.widget.FuzzyModeSideButtonWidget; -import com.refinedmods.refinedstorage.platform.common.support.widget.SchedulingModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.AbstractFilterScreen; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.widget.FuzzyModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.widget.SchedulingModeSideButtonWidget; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorBlock.java similarity index 59% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorBlock.java index d8bcf6cf0..0fcca8aa1 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorBlock.java @@ -1,12 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.common.util.IdentifierUtil; import javax.annotation.Nullable; @@ -17,12 +18,10 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; - public class DestructorBlock extends AbstractConstructorDestructorBlock< DestructorBlock, DestructorBlockEntity, BaseBlockItem > implements BlockItemProvider { - private static final Component HELP = createTranslation("item", "destructor.help"); + private static final Component HELP = IdentifierUtil.createTranslation("item", "destructor.help"); public DestructorBlock(final DyeColor color, final MutableComponent name) { super(color, name, new NetworkNodeBlockEntityTicker<>( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorBlockEntity.java similarity index 83% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorBlockEntity.java index 205cdebe9..c74ca14f5 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorBlockEntity.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; import com.refinedmods.refinedstorage.api.network.node.NetworkNodeActor; @@ -6,19 +6,19 @@ import com.refinedmods.refinedstorage.api.resource.filter.Filter; import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategy; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.FilterModeSettings; -import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage.platform.common.support.network.AbstractUpgradeableNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategy; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.FilterModeSettings; +import com.refinedmods.refinedstorage.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.support.network.AbstractUpgradeableNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations; import java.util.List; import java.util.Set; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorContainerMenu.java similarity index 69% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorContainerMenu.java index 73a3452da..3f2b47661 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorContainerMenu.java @@ -1,22 +1,22 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractSimpleFilterContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.containermenu.AbstractSimpleFilterContainerMenu; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class DestructorContainerMenu extends AbstractSimpleFilterContainerMenu { private static final MutableComponent FILTER_HELP = createTranslation("gui", "destructor.filter_help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorPickupItemsSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorPickupItemsSideButtonWidget.java similarity index 54% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorPickupItemsSideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorPickupItemsSideButtonWidget.java index ab3af7fe7..3c80a1fc1 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorPickupItemsSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorPickupItemsSideButtonWidget.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractYesNoSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.widget.AbstractYesNoSideButtonWidget; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; class DestructorPickupItemsSideButtonWidget extends AbstractYesNoSideButtonWidget { DestructorPickupItemsSideButtonWidget(final ClientProperty property) { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorScreen.java similarity index 66% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorScreen.java index b1137fc1d..0aa29c81b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorScreen.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; -import com.refinedmods.refinedstorage.platform.common.storage.FilterModeSideButtonWidget; -import com.refinedmods.refinedstorage.platform.common.support.AbstractFilterScreen; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.storage.FilterModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.AbstractFilterScreen; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class DestructorScreen extends AbstractFilterScreen { public DestructorScreen(final DestructorContainerMenu menu, final Inventory playerInventory, final Component text) { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/FluidBreakDestructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/FluidBreakDestructorStrategy.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/FluidBreakDestructorStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/FluidBreakDestructorStrategy.java index efee55964..5e6cc176f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/FluidBreakDestructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/FluidBreakDestructorStrategy.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.Network; @@ -6,9 +6,9 @@ import com.refinedmods.refinedstorage.api.resource.filter.Filter; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategy; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategy; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; import java.util.function.Supplier; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/FluidBreakDestructorStrategyFactory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/FluidBreakDestructorStrategyFactory.java similarity index 67% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/FluidBreakDestructorStrategyFactory.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/FluidBreakDestructorStrategyFactory.java index c4b3a49c5..3b5c54c1e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/FluidBreakDestructorStrategyFactory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/FluidBreakDestructorStrategyFactory.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategy; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategy; +import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategyFactory; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemDropConstructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ItemDropConstructorStrategy.java similarity index 94% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemDropConstructorStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ItemDropConstructorStrategy.java index bd39c7125..c4b8bf913 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemDropConstructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ItemDropConstructorStrategy.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; import com.refinedmods.refinedstorage.api.storage.Actor; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemDropConstructorStrategyFactory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ItemDropConstructorStrategyFactory.java similarity index 70% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemDropConstructorStrategyFactory.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ItemDropConstructorStrategyFactory.java index ee9b0b2fc..10c3be090 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemDropConstructorStrategyFactory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ItemDropConstructorStrategyFactory.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.ConstructorStrategy; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.ConstructorStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.common.api.constructordestructor.ConstructorStrategy; +import com.refinedmods.refinedstorage.common.api.constructordestructor.ConstructorStrategyFactory; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.common.content.Items; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemPickupDestructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ItemPickupDestructorStrategy.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemPickupDestructorStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ItemPickupDestructorStrategy.java index 483ee6164..9a7e11037 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemPickupDestructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ItemPickupDestructorStrategy.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.Network; @@ -6,8 +6,8 @@ import com.refinedmods.refinedstorage.api.resource.filter.Filter; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategy; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategy; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.util.List; import java.util.function.Supplier; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemPickupDestructorStrategyFactory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ItemPickupDestructorStrategyFactory.java similarity index 71% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemPickupDestructorStrategyFactory.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ItemPickupDestructorStrategyFactory.java index 58b2d98d1..6aebe0ba7 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemPickupDestructorStrategyFactory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ItemPickupDestructorStrategyFactory.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategy; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategy; +import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategyFactory; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceBlockConstructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/PlaceBlockConstructorStrategy.java similarity index 86% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceBlockConstructorStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/PlaceBlockConstructorStrategy.java index ca95da0a8..3d7370ae2 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceBlockConstructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/PlaceBlockConstructorStrategy.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.common.Platform; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceFireworksConstructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/PlaceFireworksConstructorStrategy.java similarity index 93% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceFireworksConstructorStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/PlaceFireworksConstructorStrategy.java index 0d6c2d4a6..20fee8e5e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceFireworksConstructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/PlaceFireworksConstructorStrategy.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; import com.refinedmods.refinedstorage.api.storage.Actor; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceFluidConstructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/PlaceFluidConstructorStrategy.java similarity index 86% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceFluidConstructorStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/PlaceFluidConstructorStrategy.java index 4b8cfe1dd..34491e68a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceFluidConstructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/PlaceFluidConstructorStrategy.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.Network; @@ -6,9 +6,9 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.platform.api.constructordestructor.ConstructorStrategy; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.constructordestructor.ConstructorStrategy; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/package-info.java new file mode 100644 index 000000000..0840bf54f --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.constructordestructor; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockColorMap.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/BlockColorMap.java similarity index 96% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockColorMap.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/BlockColorMap.java index 78903ff2d..1d3c5896d 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockColorMap.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/BlockColorMap.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.content; +package com.refinedmods.refinedstorage.common.content; -import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.common.support.BlockItemProvider; import java.util.Objects; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockConstants.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/BlockConstants.java similarity index 89% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockConstants.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/BlockConstants.java index 06eb6bead..d5605fc3a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockConstants.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/BlockConstants.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.content; +package com.refinedmods.refinedstorage.common.content; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockEntities.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/BlockEntities.java similarity index 80% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockEntities.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/BlockEntities.java index b61b29386..35b5a0801 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockEntities.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/BlockEntities.java @@ -1,30 +1,30 @@ -package com.refinedmods.refinedstorage.platform.common.content; +package com.refinedmods.refinedstorage.common.content; import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; -import com.refinedmods.refinedstorage.platform.common.constructordestructor.ConstructorBlockEntity; -import com.refinedmods.refinedstorage.platform.common.constructordestructor.DestructorBlockEntity; -import com.refinedmods.refinedstorage.platform.common.controller.ControllerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.detector.DetectorBlockEntity; -import com.refinedmods.refinedstorage.platform.common.exporter.ExporterBlockEntity; -import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridBlockEntity; -import com.refinedmods.refinedstorage.platform.common.grid.GridBlockEntity; -import com.refinedmods.refinedstorage.platform.common.iface.InterfaceBlockEntity; -import com.refinedmods.refinedstorage.platform.common.importer.ImporterBlockEntity; -import com.refinedmods.refinedstorage.platform.common.networking.NetworkReceiverBlockEntity; -import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterBlockEntity; -import com.refinedmods.refinedstorage.platform.common.networking.RelayBlockEntity; -import com.refinedmods.refinedstorage.platform.common.security.SecurityManagerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.externalstorage.ExternalStorageBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.storageblock.FluidStorageBlockBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.storageblock.ItemStorageBlockBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storagemonitor.StorageMonitorBlockEntity; -import com.refinedmods.refinedstorage.platform.common.support.network.BaseNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.WirelessTransmitterBlockEntity; +import com.refinedmods.refinedstorage.common.constructordestructor.ConstructorBlockEntity; +import com.refinedmods.refinedstorage.common.constructordestructor.DestructorBlockEntity; +import com.refinedmods.refinedstorage.common.controller.ControllerBlockEntity; +import com.refinedmods.refinedstorage.common.detector.DetectorBlockEntity; +import com.refinedmods.refinedstorage.common.exporter.ExporterBlockEntity; +import com.refinedmods.refinedstorage.common.grid.CraftingGridBlockEntity; +import com.refinedmods.refinedstorage.common.grid.GridBlockEntity; +import com.refinedmods.refinedstorage.common.iface.InterfaceBlockEntity; +import com.refinedmods.refinedstorage.common.importer.ImporterBlockEntity; +import com.refinedmods.refinedstorage.common.networking.NetworkReceiverBlockEntity; +import com.refinedmods.refinedstorage.common.networking.NetworkTransmitterBlockEntity; +import com.refinedmods.refinedstorage.common.networking.RelayBlockEntity; +import com.refinedmods.refinedstorage.common.security.SecurityManagerBlockEntity; +import com.refinedmods.refinedstorage.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.common.storage.ItemStorageVariant; +import com.refinedmods.refinedstorage.common.storage.diskdrive.AbstractDiskDriveBlockEntity; +import com.refinedmods.refinedstorage.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.common.storage.externalstorage.ExternalStorageBlockEntity; +import com.refinedmods.refinedstorage.common.storage.portablegrid.AbstractPortableGridBlockEntity; +import com.refinedmods.refinedstorage.common.storage.storageblock.FluidStorageBlockBlockEntity; +import com.refinedmods.refinedstorage.common.storage.storageblock.ItemStorageBlockBlockEntity; +import com.refinedmods.refinedstorage.common.storagemonitor.StorageMonitorBlockEntity; +import com.refinedmods.refinedstorage.common.support.network.BaseNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.wirelesstransmitter.WirelessTransmitterBlockEntity; import java.util.EnumMap; import java.util.Map; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockEntityTypeFactory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/BlockEntityTypeFactory.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockEntityTypeFactory.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/BlockEntityTypeFactory.java index 215520e30..7241a7550 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockEntityTypeFactory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/BlockEntityTypeFactory.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.content; +package com.refinedmods.refinedstorage.common.content; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.Block; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockFactory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/BlockFactory.java similarity index 80% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockFactory.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/BlockFactory.java index b5db3628c..41c0fdf34 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockFactory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/BlockFactory.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.content; +package com.refinedmods.refinedstorage.common.content; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.DyeColor; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Blocks.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Blocks.java similarity index 79% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Blocks.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Blocks.java index 45231593d..1ad8a5c1e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Blocks.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Blocks.java @@ -1,37 +1,37 @@ -package com.refinedmods.refinedstorage.platform.common.content; - -import com.refinedmods.refinedstorage.platform.common.constructordestructor.ConstructorBlock; -import com.refinedmods.refinedstorage.platform.common.constructordestructor.DestructorBlock; -import com.refinedmods.refinedstorage.platform.common.controller.AbstractControllerBlock; -import com.refinedmods.refinedstorage.platform.common.controller.ControllerBlock; -import com.refinedmods.refinedstorage.platform.common.controller.ControllerBlockEntityTicker; -import com.refinedmods.refinedstorage.platform.common.controller.ControllerBlockItem; -import com.refinedmods.refinedstorage.platform.common.controller.CreativeControllerBlock; -import com.refinedmods.refinedstorage.platform.common.controller.CreativeControllerBlockItem; -import com.refinedmods.refinedstorage.platform.common.detector.DetectorBlock; -import com.refinedmods.refinedstorage.platform.common.exporter.ExporterBlock; -import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridBlock; -import com.refinedmods.refinedstorage.platform.common.grid.GridBlock; -import com.refinedmods.refinedstorage.platform.common.iface.InterfaceBlock; -import com.refinedmods.refinedstorage.platform.common.importer.ImporterBlock; -import com.refinedmods.refinedstorage.platform.common.networking.CableBlock; -import com.refinedmods.refinedstorage.platform.common.networking.NetworkReceiverBlock; -import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterBlock; -import com.refinedmods.refinedstorage.platform.common.networking.RelayBlock; -import com.refinedmods.refinedstorage.platform.common.security.SecurityManagerBlock; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.DiskDriveBlock; -import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.DiskInterfaceBlock; -import com.refinedmods.refinedstorage.platform.common.storage.externalstorage.ExternalStorageBlock; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlock; -import com.refinedmods.refinedstorage.platform.common.storage.storageblock.FluidStorageBlock; -import com.refinedmods.refinedstorage.platform.common.storage.storageblock.ItemStorageBlock; -import com.refinedmods.refinedstorage.platform.common.storagemonitor.StorageMonitorBlock; -import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.SimpleBlock; -import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.WirelessTransmitterBlock; +package com.refinedmods.refinedstorage.common.content; + +import com.refinedmods.refinedstorage.common.constructordestructor.ConstructorBlock; +import com.refinedmods.refinedstorage.common.constructordestructor.DestructorBlock; +import com.refinedmods.refinedstorage.common.controller.AbstractControllerBlock; +import com.refinedmods.refinedstorage.common.controller.ControllerBlock; +import com.refinedmods.refinedstorage.common.controller.ControllerBlockEntityTicker; +import com.refinedmods.refinedstorage.common.controller.ControllerBlockItem; +import com.refinedmods.refinedstorage.common.controller.CreativeControllerBlock; +import com.refinedmods.refinedstorage.common.controller.CreativeControllerBlockItem; +import com.refinedmods.refinedstorage.common.detector.DetectorBlock; +import com.refinedmods.refinedstorage.common.exporter.ExporterBlock; +import com.refinedmods.refinedstorage.common.grid.CraftingGridBlock; +import com.refinedmods.refinedstorage.common.grid.GridBlock; +import com.refinedmods.refinedstorage.common.iface.InterfaceBlock; +import com.refinedmods.refinedstorage.common.importer.ImporterBlock; +import com.refinedmods.refinedstorage.common.networking.CableBlock; +import com.refinedmods.refinedstorage.common.networking.NetworkReceiverBlock; +import com.refinedmods.refinedstorage.common.networking.NetworkTransmitterBlock; +import com.refinedmods.refinedstorage.common.networking.RelayBlock; +import com.refinedmods.refinedstorage.common.security.SecurityManagerBlock; +import com.refinedmods.refinedstorage.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.common.storage.ItemStorageVariant; +import com.refinedmods.refinedstorage.common.storage.diskdrive.DiskDriveBlock; +import com.refinedmods.refinedstorage.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.common.storage.diskinterface.DiskInterfaceBlock; +import com.refinedmods.refinedstorage.common.storage.externalstorage.ExternalStorageBlock; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridBlock; +import com.refinedmods.refinedstorage.common.storage.storageblock.FluidStorageBlock; +import com.refinedmods.refinedstorage.common.storage.storageblock.ItemStorageBlock; +import com.refinedmods.refinedstorage.common.storagemonitor.StorageMonitorBlock; +import com.refinedmods.refinedstorage.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.common.support.SimpleBlock; +import com.refinedmods.refinedstorage.common.wirelesstransmitter.WirelessTransmitterBlock; import java.util.EnumMap; import java.util.Map; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ColorMap.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ColorMap.java similarity index 97% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ColorMap.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ColorMap.java index f003f4160..e39bfa7b1 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ColorMap.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ColorMap.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.content; +package com.refinedmods.refinedstorage.common.content; import java.util.Collection; import java.util.Comparator; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ContentIds.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ContentIds.java similarity index 93% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ContentIds.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ContentIds.java index 280b795c4..e49c5a4aa 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ContentIds.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ContentIds.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.content; +package com.refinedmods.refinedstorage.common.content; -import com.refinedmods.refinedstorage.platform.common.misc.ProcessorItem; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; +import com.refinedmods.refinedstorage.common.misc.ProcessorItem; +import com.refinedmods.refinedstorage.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.common.storage.ItemStorageVariant; import net.minecraft.resources.ResourceLocation; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public final class ContentIds { public static final ResourceLocation DISK_DRIVE = createIdentifier("disk_drive"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ContentNames.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ContentNames.java similarity index 89% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ContentNames.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ContentNames.java index ec4706e4f..15dbaf974 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ContentNames.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ContentNames.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.content; +package com.refinedmods.refinedstorage.common.content; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.MOD_ID; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslationKey; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.MOD_ID; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslationKey; public final class ContentNames { public static final String MOD_TRANSLATION_KEY = "mod." + MOD_ID; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/CreativeModeTabItems.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/CreativeModeTabItems.java similarity index 95% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/CreativeModeTabItems.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/CreativeModeTabItems.java index e331aa620..25c381fca 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/CreativeModeTabItems.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/CreativeModeTabItems.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.content; +package com.refinedmods.refinedstorage.common.content; -import com.refinedmods.refinedstorage.platform.common.misc.ProcessorItem; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; +import com.refinedmods.refinedstorage.common.misc.ProcessorItem; +import com.refinedmods.refinedstorage.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.common.storage.ItemStorageVariant; import java.util.Arrays; import java.util.function.Consumer; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/DataComponents.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/DataComponents.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/DataComponents.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/DataComponents.java index ba8107a77..5f8746eb6 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/DataComponents.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/DataComponents.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.content; +package com.refinedmods.refinedstorage.common.content; -import com.refinedmods.refinedstorage.platform.common.configurationcard.ConfigurationCardState; -import com.refinedmods.refinedstorage.platform.common.security.SecurityCardBoundPlayer; -import com.refinedmods.refinedstorage.platform.common.security.SecurityCardPermissions; -import com.refinedmods.refinedstorage.platform.common.upgrade.RegulatorUpgradeState; +import com.refinedmods.refinedstorage.common.configurationcard.ConfigurationCardState; +import com.refinedmods.refinedstorage.common.security.SecurityCardBoundPlayer; +import com.refinedmods.refinedstorage.common.security.SecurityCardPermissions; +import com.refinedmods.refinedstorage.common.upgrade.RegulatorUpgradeState; import java.util.UUID; import java.util.function.Supplier; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/DefaultEnergyUsage.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/DefaultEnergyUsage.java similarity index 97% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/DefaultEnergyUsage.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/DefaultEnergyUsage.java index be4e752ad..01a3e8648 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/DefaultEnergyUsage.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/DefaultEnergyUsage.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.content; +package com.refinedmods.refinedstorage.common.content; public final class DefaultEnergyUsage { public static final long CABLE = 0; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/DirectRegistryCallback.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/DirectRegistryCallback.java similarity index 87% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/DirectRegistryCallback.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/DirectRegistryCallback.java index a8b3dbe03..9523bcea3 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/DirectRegistryCallback.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/DirectRegistryCallback.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.content; +package com.refinedmods.refinedstorage.common.content; import java.util.function.Supplier; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ExtendedMenuTypeFactory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ExtendedMenuTypeFactory.java similarity index 91% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ExtendedMenuTypeFactory.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ExtendedMenuTypeFactory.java index e1175e812..90a869ede 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ExtendedMenuTypeFactory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ExtendedMenuTypeFactory.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.content; +package com.refinedmods.refinedstorage.common.content; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Items.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Items.java similarity index 94% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Items.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Items.java index 4e74e7b9b..48d1f51f9 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Items.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Items.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.common.content; - -import com.refinedmods.refinedstorage.platform.api.upgrade.AbstractUpgradeItem; -import com.refinedmods.refinedstorage.platform.common.controller.ControllerBlockItem; -import com.refinedmods.refinedstorage.platform.common.controller.CreativeControllerBlockItem; -import com.refinedmods.refinedstorage.platform.common.grid.WirelessGridItem; -import com.refinedmods.refinedstorage.platform.common.misc.ProcessorItem; -import com.refinedmods.refinedstorage.platform.common.security.FallbackSecurityCardItem; -import com.refinedmods.refinedstorage.platform.common.security.SecurityCardItem; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; +package com.refinedmods.refinedstorage.common.content; + +import com.refinedmods.refinedstorage.common.api.upgrade.AbstractUpgradeItem; +import com.refinedmods.refinedstorage.common.controller.ControllerBlockItem; +import com.refinedmods.refinedstorage.common.controller.CreativeControllerBlockItem; +import com.refinedmods.refinedstorage.common.grid.WirelessGridItem; +import com.refinedmods.refinedstorage.common.misc.ProcessorItem; +import com.refinedmods.refinedstorage.common.security.FallbackSecurityCardItem; +import com.refinedmods.refinedstorage.common.security.SecurityCardItem; +import com.refinedmods.refinedstorage.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.common.storage.ItemStorageVariant; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridBlockItem; +import com.refinedmods.refinedstorage.common.support.BaseBlockItem; import java.util.ArrayList; import java.util.Collections; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/KeyMappings.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/KeyMappings.java similarity index 96% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/KeyMappings.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/KeyMappings.java index 897727fda..ee88ed6ae 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/KeyMappings.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/KeyMappings.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.content; +package com.refinedmods.refinedstorage.common.content; import java.util.Objects; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/LootFunctions.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/LootFunctions.java similarity index 80% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/LootFunctions.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/LootFunctions.java index e31dba985..9f58df1f2 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/LootFunctions.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/LootFunctions.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.content; +package com.refinedmods.refinedstorage.common.content; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridLootItemFunction; -import com.refinedmods.refinedstorage.platform.common.storage.storageblock.StorageBlockLootItemFunction; -import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyLootItemFunction; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridLootItemFunction; +import com.refinedmods.refinedstorage.common.storage.storageblock.StorageBlockLootItemFunction; +import com.refinedmods.refinedstorage.common.support.energy.EnergyLootItemFunction; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/MenuTypeFactory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/MenuTypeFactory.java similarity index 87% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/MenuTypeFactory.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/MenuTypeFactory.java index ec3e58f6a..dea2d7172 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/MenuTypeFactory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/MenuTypeFactory.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.content; +package com.refinedmods.refinedstorage.common.content; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Menus.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Menus.java similarity index 79% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Menus.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Menus.java index c8c132c8f..e314602ff 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Menus.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Menus.java @@ -1,30 +1,30 @@ -package com.refinedmods.refinedstorage.platform.common.content; - -import com.refinedmods.refinedstorage.platform.common.constructordestructor.ConstructorContainerMenu; -import com.refinedmods.refinedstorage.platform.common.constructordestructor.DestructorContainerMenu; -import com.refinedmods.refinedstorage.platform.common.controller.ControllerContainerMenu; -import com.refinedmods.refinedstorage.platform.common.detector.DetectorContainerMenu; -import com.refinedmods.refinedstorage.platform.common.exporter.ExporterContainerMenu; -import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.grid.GridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.grid.WirelessGridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.iface.InterfaceContainerMenu; -import com.refinedmods.refinedstorage.platform.common.importer.ImporterContainerMenu; -import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterContainerMenu; -import com.refinedmods.refinedstorage.platform.common.networking.RelayContainerMenu; -import com.refinedmods.refinedstorage.platform.common.security.FallbackSecurityCardContainerMenu; -import com.refinedmods.refinedstorage.platform.common.security.SecurityCardContainerMenu; -import com.refinedmods.refinedstorage.platform.common.security.SecurityManagerContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.DiskDriveContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.DiskInterfaceContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storage.externalstorage.ExternalStorageContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlockContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridItemContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storage.storageblock.FluidStorageBlockContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storage.storageblock.ItemStorageBlockContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storagemonitor.StorageMonitorContainerMenu; -import com.refinedmods.refinedstorage.platform.common.upgrade.RegulatorUpgradeContainerMenu; -import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.WirelessTransmitterContainerMenu; +package com.refinedmods.refinedstorage.common.content; + +import com.refinedmods.refinedstorage.common.constructordestructor.ConstructorContainerMenu; +import com.refinedmods.refinedstorage.common.constructordestructor.DestructorContainerMenu; +import com.refinedmods.refinedstorage.common.controller.ControllerContainerMenu; +import com.refinedmods.refinedstorage.common.detector.DetectorContainerMenu; +import com.refinedmods.refinedstorage.common.exporter.ExporterContainerMenu; +import com.refinedmods.refinedstorage.common.grid.CraftingGridContainerMenu; +import com.refinedmods.refinedstorage.common.grid.GridContainerMenu; +import com.refinedmods.refinedstorage.common.grid.WirelessGridContainerMenu; +import com.refinedmods.refinedstorage.common.iface.InterfaceContainerMenu; +import com.refinedmods.refinedstorage.common.importer.ImporterContainerMenu; +import com.refinedmods.refinedstorage.common.networking.NetworkTransmitterContainerMenu; +import com.refinedmods.refinedstorage.common.networking.RelayContainerMenu; +import com.refinedmods.refinedstorage.common.security.FallbackSecurityCardContainerMenu; +import com.refinedmods.refinedstorage.common.security.SecurityCardContainerMenu; +import com.refinedmods.refinedstorage.common.security.SecurityManagerContainerMenu; +import com.refinedmods.refinedstorage.common.storage.diskdrive.DiskDriveContainerMenu; +import com.refinedmods.refinedstorage.common.storage.diskinterface.DiskInterfaceContainerMenu; +import com.refinedmods.refinedstorage.common.storage.externalstorage.ExternalStorageContainerMenu; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridBlockContainerMenu; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridItemContainerMenu; +import com.refinedmods.refinedstorage.common.storage.storageblock.FluidStorageBlockContainerMenu; +import com.refinedmods.refinedstorage.common.storage.storageblock.ItemStorageBlockContainerMenu; +import com.refinedmods.refinedstorage.common.storagemonitor.StorageMonitorContainerMenu; +import com.refinedmods.refinedstorage.common.upgrade.RegulatorUpgradeContainerMenu; +import com.refinedmods.refinedstorage.common.wirelesstransmitter.WirelessTransmitterContainerMenu; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/RegistryCallback.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/RegistryCallback.java similarity index 78% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/RegistryCallback.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/RegistryCallback.java index abc5a4d5b..6fb51fce1 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/RegistryCallback.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/RegistryCallback.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.content; +package com.refinedmods.refinedstorage.common.content; import java.util.function.Supplier; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Sounds.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Sounds.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Sounds.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Sounds.java index 93e32482c..088de958f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Sounds.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Sounds.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.content; +package com.refinedmods.refinedstorage.common.content; import java.util.Objects; import java.util.function.Supplier; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Tags.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Tags.java similarity index 91% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Tags.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Tags.java index 7181bd4ab..ce7b848c9 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Tags.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Tags.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.content; +package com.refinedmods.refinedstorage.common.content; import net.minecraft.core.registries.Registries; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public final class Tags { public static final TagKey CABLES = createTag("cables"); diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/package-info.java similarity index 78% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/package-info.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/package-info.java index f9ffc5d33..aac3efdb1 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/package-info.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.fabric; +package com.refinedmods.refinedstorage.common.content; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/AbstractControllerBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/AbstractControllerBlock.java similarity index 87% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/AbstractControllerBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/AbstractControllerBlock.java index f3f2cf266..62b54d925 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/AbstractControllerBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/AbstractControllerBlock.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.controller; +package com.refinedmods.refinedstorage.common.controller; -import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseBlock; -import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage.platform.common.support.ColorableBlock; +import com.refinedmods.refinedstorage.common.content.BlockConstants; +import com.refinedmods.refinedstorage.common.support.AbstractBaseBlock; +import com.refinedmods.refinedstorage.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.common.support.ColorableBlock; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.MutableComponent; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerBlock.java similarity index 77% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerBlock.java index 4dc5b63bb..0538e354f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerBlock.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.controller; +package com.refinedmods.refinedstorage.common.controller; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.Blocks; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.DyeColor; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerBlockEntity.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerBlockEntity.java index f2949e14e..23dc8d7dc 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerBlockEntity.java @@ -1,17 +1,17 @@ -package com.refinedmods.refinedstorage.platform.common.controller; +package com.refinedmods.refinedstorage.common.controller; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage.api.network.impl.energy.EnergyStorageImpl; import com.refinedmods.refinedstorage.api.network.impl.node.controller.ControllerNetworkNode; -import com.refinedmods.refinedstorage.platform.api.support.energy.TransferableBlockEntityEnergy; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage.platform.common.support.energy.BlockEntityEnergyStorage; -import com.refinedmods.refinedstorage.platform.common.support.energy.CreativeEnergyStorage; -import com.refinedmods.refinedstorage.platform.common.support.energy.ItemBlockEnergyStorage; -import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.support.energy.TransferableBlockEntityEnergy; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.support.energy.BlockEntityEnergyStorage; +import com.refinedmods.refinedstorage.common.support.energy.CreativeEnergyStorage; +import com.refinedmods.refinedstorage.common.support.energy.ItemBlockEnergyStorage; +import com.refinedmods.refinedstorage.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; import com.google.common.util.concurrent.RateLimiter; import net.minecraft.core.BlockPos; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlockEntityTicker.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerBlockEntityTicker.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlockEntityTicker.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerBlockEntityTicker.java index 301b0a961..88ca713aa 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlockEntityTicker.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerBlockEntityTicker.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.controller; +package com.refinedmods.refinedstorage.common.controller; import com.refinedmods.refinedstorage.api.network.impl.node.controller.ControllerNetworkNode; -import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker; import java.util.function.Supplier; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlockItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerBlockItem.java similarity index 78% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlockItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerBlockItem.java index b4c5c3887..6c7eb5038 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlockItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerBlockItem.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.controller; +package com.refinedmods.refinedstorage.common.controller; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage.api.network.impl.energy.EnergyStorageImpl; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage.platform.api.support.energy.AbstractEnergyBlockItem; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.common.api.support.energy.AbstractEnergyBlockItem; +import com.refinedmods.refinedstorage.common.content.BlockEntities; import java.util.Optional; @@ -19,7 +19,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class ControllerBlockItem extends AbstractEnergyBlockItem { private final Block block; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerContainerMenu.java similarity index 69% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerContainerMenu.java index 0147027fd..85200a5a2 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerContainerMenu.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.controller; +package com.refinedmods.refinedstorage.common.controller; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyInfo; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.common.support.energy.EnergyContainerMenu; +import com.refinedmods.refinedstorage.common.support.energy.EnergyInfo; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerData.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerData.java similarity index 87% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerData.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerData.java index 6ef5837bb..438b059d5 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerData.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerData.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.controller; +package com.refinedmods.refinedstorage.common.controller; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerEnergyType.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerEnergyType.java similarity index 91% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerEnergyType.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerEnergyType.java index b42670671..e849c35dd 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerEnergyType.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerEnergyType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.controller; +package com.refinedmods.refinedstorage.common.controller; import com.refinedmods.refinedstorage.api.network.impl.node.controller.ControllerEnergyState; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerItemPropertyFunction.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerItemPropertyFunction.java similarity index 87% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerItemPropertyFunction.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerItemPropertyFunction.java index 846fafaca..7f200d0cc 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerItemPropertyFunction.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerItemPropertyFunction.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.controller; +package com.refinedmods.refinedstorage.common.controller; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.PlatformApi; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerScreen.java similarity index 71% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerScreen.java index 7565b4535..52f22ab2e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerScreen.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.controller; +package com.refinedmods.refinedstorage.common.controller; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.widget.ProgressWidget; -import com.refinedmods.refinedstorage.platform.common.support.widget.RedstoneModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.widget.ProgressWidget; +import com.refinedmods.refinedstorage.common.support.widget.RedstoneModeSideButtonWidget; import javax.annotation.Nullable; @@ -11,8 +11,8 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class ControllerScreen extends AbstractBaseScreen { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/controller.png"); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerType.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerType.java new file mode 100644 index 000000000..5e3e39bdf --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerType.java @@ -0,0 +1,6 @@ +package com.refinedmods.refinedstorage.common.controller; + +public enum ControllerType { + NORMAL, + CREATIVE +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/CreativeControllerBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/CreativeControllerBlock.java similarity index 79% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/CreativeControllerBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/CreativeControllerBlock.java index ed951bb4d..22f4f76b9 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/CreativeControllerBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/CreativeControllerBlock.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.controller; +package com.refinedmods.refinedstorage.common.controller; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.Blocks; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.DyeColor; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/CreativeControllerBlockItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/CreativeControllerBlockItem.java similarity index 63% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/CreativeControllerBlockItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/CreativeControllerBlockItem.java index 85d33b3a3..364b5a6dc 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/CreativeControllerBlockItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/CreativeControllerBlockItem.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.controller; +package com.refinedmods.refinedstorage.common.controller; -import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class CreativeControllerBlockItem extends NetworkNodeBlockItem { private static final MutableComponent HELP = createTranslation("item", "creative_controller.help"); diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/package-info.java similarity index 78% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/package-info.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/package-info.java index 1ae578de9..42204e854 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/package-info.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.grid; +package com.refinedmods.refinedstorage.common.controller; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorBlock.java similarity index 79% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorBlock.java index eee8dc9f2..f9945409a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorBlock.java @@ -1,18 +1,18 @@ -package com.refinedmods.refinedstorage.platform.common.detector; - -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage.platform.common.support.ColorableBlock; -import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.direction.DefaultDirectionType; -import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; -import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; +package com.refinedmods.refinedstorage.common.detector; + +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.BlockConstants; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.common.support.ColorableBlock; +import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.common.support.direction.DefaultDirectionType; +import com.refinedmods.refinedstorage.common.support.direction.DirectionType; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -33,7 +33,7 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class DetectorBlock extends AbstractDirectionalBlock implements ColorableBlock, SimpleWaterloggedBlock, EntityBlock, diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorBlockEntity.java similarity index 85% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorBlockEntity.java index f6a077423..15f0eb053 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorBlockEntity.java @@ -1,22 +1,22 @@ -package com.refinedmods.refinedstorage.platform.common.detector; +package com.refinedmods.refinedstorage.common.detector; import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorAmountStrategy; import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorAmountStrategyImpl; import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorMode; import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorNetworkNode; -import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionSink; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.SingleAmountData; -import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.support.containermenu.SingleAmountData; +import com.refinedmods.refinedstorage.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; import java.util.Optional; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorContainerMenu.java similarity index 69% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorContainerMenu.java index f086add1b..6a3c21789 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorContainerMenu.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.detector; +package com.refinedmods.refinedstorage.common.detector; import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorMode; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractSingleAmountContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.SingleAmountData; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.support.containermenu.AbstractSingleAmountContainerMenu; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.SingleAmountData; import javax.annotation.Nullable; @@ -15,7 +15,7 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class DetectorContainerMenu extends AbstractSingleAmountContainerMenu { private static final Component FILTER_HELP = createTranslation("gui", "detector.filter_help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorModeSettings.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorModeSettings.java similarity index 92% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorModeSettings.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorModeSettings.java index 5b768fc82..daa225600 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorModeSettings.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorModeSettings.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.detector; +package com.refinedmods.refinedstorage.common.detector; import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorMode; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorModeSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorModeSideButtonWidget.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorModeSideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorModeSideButtonWidget.java index b53e05f63..8e9da9084 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorModeSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorModeSideButtonWidget.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.detector; +package com.refinedmods.refinedstorage.common.detector; import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.widget.AbstractSideButtonWidget; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; class DetectorModeSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "detector.mode"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorPropertyTypes.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorPropertyTypes.java similarity index 60% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorPropertyTypes.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorPropertyTypes.java index 1bf75cfd7..d910786e8 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorPropertyTypes.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorPropertyTypes.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.detector; +package com.refinedmods.refinedstorage.common.detector; import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyType; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyType; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; final class DetectorPropertyTypes { static final PropertyType MODE = new PropertyType<>( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorScreen.java similarity index 67% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorScreen.java index 7525f0d98..33b8c5445 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorScreen.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.detector; +package com.refinedmods.refinedstorage.common.detector; -import com.refinedmods.refinedstorage.platform.common.support.amount.AbstractSingleAmountScreen; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.widget.FuzzyModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.amount.AbstractSingleAmountScreen; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.widget.FuzzyModeSideButtonWidget; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/FuzzyDetectorAmountStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/FuzzyDetectorAmountStrategy.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/FuzzyDetectorAmountStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/FuzzyDetectorAmountStrategy.java index 54264ddb0..e3b6e9e0e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/FuzzyDetectorAmountStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/FuzzyDetectorAmountStrategy.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.detector; +package com.refinedmods.refinedstorage.common.detector; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.network.impl.node.detector.AbstractDetectorAmountStrategy; @@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.platform.api.storage.channel.FuzzyStorageChannel; +import com.refinedmods.refinedstorage.common.api.storage.channel.FuzzyStorageChannel; class FuzzyDetectorAmountStrategy extends AbstractDetectorAmountStrategy { private final DetectorAmountStrategy fallback; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/package-info.java new file mode 100644 index 000000000..f9d33bd9a --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.detector; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterBlock.java similarity index 73% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterBlock.java index e25dd9983..2358a778a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterBlock.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.common.exporter; +package com.refinedmods.refinedstorage.common.exporter; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalCableBlock; -import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage.platform.common.support.ColorableBlock; -import com.refinedmods.refinedstorage.platform.common.support.DirectionalCableBlockShapes; -import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.AbstractDirectionalCableBlock; +import com.refinedmods.refinedstorage.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.common.support.ColorableBlock; +import com.refinedmods.refinedstorage.common.support.DirectionalCableBlockShapes; +import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker; import java.util.HashMap; import java.util.Map; @@ -29,7 +29,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.shapes.VoxelShape; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class ExporterBlock extends AbstractDirectionalCableBlock implements ColorableBlock, EntityBlock, BlockItemProvider { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterBlockEntity.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterBlockEntity.java index 9b7a162d3..3c55fc645 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterBlockEntity.java @@ -1,20 +1,20 @@ -package com.refinedmods.refinedstorage.platform.common.exporter; +package com.refinedmods.refinedstorage.common.exporter; import com.refinedmods.refinedstorage.api.network.impl.node.exporter.CompositeExporterTransferStrategy; import com.refinedmods.refinedstorage.api.network.impl.node.exporter.ExporterNetworkNode; import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; import com.refinedmods.refinedstorage.api.network.node.task.TaskExecutor; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.api.exporter.ExporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.network.AbstractSchedulingNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.exporter.ExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.network.AbstractSchedulingNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations; import java.util.List; import java.util.function.LongSupplier; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterContainerMenu.java similarity index 65% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterContainerMenu.java index ddd61753a..ed9714e9d 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterContainerMenu.java @@ -1,17 +1,17 @@ -package com.refinedmods.refinedstorage.platform.common.exporter; +package com.refinedmods.refinedstorage.common.exporter; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractSchedulingContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.support.containermenu.AbstractSchedulingContainerMenu; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class ExporterContainerMenu extends AbstractSchedulingContainerMenu { private static final MutableComponent FILTER_HELP = createTranslation("gui", "exporter.filter_help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterScreen.java similarity index 62% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterScreen.java index 63cfb4fe4..e0f7bb5c3 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterScreen.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.exporter; +package com.refinedmods.refinedstorage.common.exporter; -import com.refinedmods.refinedstorage.platform.common.support.AbstractFilterScreen; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.widget.FuzzyModeSideButtonWidget; -import com.refinedmods.refinedstorage.platform.common.support.widget.SchedulingModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.AbstractFilterScreen; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.widget.FuzzyModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.widget.SchedulingModeSideButtonWidget; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/FuzzyExporterTransferStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/FuzzyExporterTransferStrategy.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/FuzzyExporterTransferStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/FuzzyExporterTransferStrategy.java index c7a17f0ed..2fe587367 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/FuzzyExporterTransferStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/FuzzyExporterTransferStrategy.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.exporter; +package com.refinedmods.refinedstorage.common.exporter; import com.refinedmods.refinedstorage.api.network.impl.node.exporter.ExporterTransferStrategyImpl; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.platform.api.storage.channel.FuzzyStorageChannel; +import com.refinedmods.refinedstorage.common.api.storage.channel.FuzzyStorageChannel; import java.util.Collection; import java.util.stream.Collectors; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/package-info.java new file mode 100644 index 000000000..289f50acd --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.exporter; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridBlock.java similarity index 56% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridBlock.java index fb3bc9b7b..1d215006b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridBlock.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; -import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage.platform.common.support.AbstractActiveColoredDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirectionType; -import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; +import com.refinedmods.refinedstorage.common.content.BlockConstants; +import com.refinedmods.refinedstorage.common.support.AbstractActiveColoredDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.common.support.direction.BiDirectionType; +import com.refinedmods.refinedstorage.common.support.direction.DirectionType; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.BlockItem; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridBlockEntity.java similarity index 82% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridBlockEntity.java index 999e66c44..d78f12745 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridBlockEntity.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; import com.refinedmods.refinedstorage.api.grid.watcher.GridWatcher; @@ -10,15 +10,15 @@ import com.refinedmods.refinedstorage.api.storage.Storage; import com.refinedmods.refinedstorage.api.storage.TrackedResourceAmount; import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.security.PlatformSecurityNetworkComponent; -import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.security.PlatformSecurityNetworkComponent; +import com.refinedmods.refinedstorage.common.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridContainerMenu.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridContainerMenu.java index c04d750fc..e2a4300a8 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridContainerMenu.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; @@ -12,28 +12,28 @@ import com.refinedmods.refinedstorage.api.grid.watcher.GridWatcher; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.grid.GridResourceAttributeKeys; -import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage.platform.api.grid.GridSynchronizer; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage.platform.api.support.registry.PlatformRegistry; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage.platform.common.Config; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.grid.strategy.ClientGridExtractionStrategy; -import com.refinedmods.refinedstorage.platform.common.grid.strategy.ClientGridInsertionStrategy; -import com.refinedmods.refinedstorage.platform.common.grid.strategy.ClientGridScrollingStrategy; -import com.refinedmods.refinedstorage.platform.common.grid.view.CompositeGridResourceFactory; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.S2CPackets; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; -import com.refinedmods.refinedstorage.platform.common.support.stretching.ScreenSizeListener; +import com.refinedmods.refinedstorage.common.Config; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.grid.GridResourceAttributeKeys; +import com.refinedmods.refinedstorage.common.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.common.api.grid.GridSynchronizer; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.common.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.common.api.support.registry.PlatformRegistry; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.common.grid.strategy.ClientGridExtractionStrategy; +import com.refinedmods.refinedstorage.common.grid.strategy.ClientGridInsertionStrategy; +import com.refinedmods.refinedstorage.common.grid.strategy.ClientGridScrollingStrategy; +import com.refinedmods.refinedstorage.common.grid.view.CompositeGridResourceFactory; +import com.refinedmods.refinedstorage.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage.common.support.packet.s2c.S2CPackets; +import com.refinedmods.refinedstorage.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage.common.support.stretching.ScreenSizeListener; import com.refinedmods.refinedstorage.query.lexer.LexerTokenMappings; import com.refinedmods.refinedstorage.query.parser.ParserOperatorMappings; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridSynchronizer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridSynchronizer.java similarity index 59% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridSynchronizer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridSynchronizer.java index 5a9834382..21490821d 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridSynchronizer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridSynchronizer.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; -import com.refinedmods.refinedstorage.platform.api.grid.GridSynchronizer; -import com.refinedmods.refinedstorage.platform.common.support.TextureIds; +import com.refinedmods.refinedstorage.common.api.grid.GridSynchronizer; +import com.refinedmods.refinedstorage.common.support.TextureIds; import net.minecraft.resources.ResourceLocation; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/ClientCraftingGridSource.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/ClientCraftingGridSource.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/ClientCraftingGridSource.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/ClientCraftingGridSource.java index c059a4652..7a773bf5d 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/ClientCraftingGridSource.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/ClientCraftingGridSource.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.packet.c2s.C2SPackets; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridBlock.java similarity index 69% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridBlock.java index e0bccbbe9..bf75a94ae 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridBlock.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker; import javax.annotation.Nullable; @@ -21,7 +21,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class CraftingGridBlock extends AbstractGridBlock implements BlockItemProvider { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridBlockEntity.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridBlockEntity.java index 49e5f2cfe..46f644f4a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridBlockEntity.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.support.BlockEntityWithDrops; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage.platform.common.util.ContainerUtil; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.support.BlockEntityWithDrops; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.util.ContainerUtil; import java.util.Optional; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridContainerMenu.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridContainerMenu.java index 2ba845e6c..fd072e186 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridContainerMenu.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; import com.refinedmods.refinedstorage.api.grid.view.GridResource; import com.refinedmods.refinedstorage.api.resource.list.ResourceList; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.grid.view.ItemGridResource; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.grid.view.ItemGridResource; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.util.ArrayList; import java.util.HashSet; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridMatrixCloseBehavior.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridMatrixCloseBehavior.java similarity index 63% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridMatrixCloseBehavior.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridMatrixCloseBehavior.java index fa99129c0..8650b7836 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridMatrixCloseBehavior.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridMatrixCloseBehavior.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; public enum CraftingGridMatrixCloseBehavior { NONE, diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridRefillContext.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridRefillContext.java similarity index 58% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridRefillContext.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridRefillContext.java index 036f76b57..8ba2f0738 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridRefillContext.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridRefillContext.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import net.minecraft.world.entity.player.Player; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridRefillContextImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridRefillContextImpl.java similarity index 78% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridRefillContextImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridRefillContextImpl.java index aa8461f6c..62ef95490 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridRefillContextImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridRefillContextImpl.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import net.minecraft.world.entity.player.Player; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridResultSlot.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridResultSlot.java similarity index 95% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridResultSlot.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridResultSlot.java index 517ecb752..4887311c1 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridResultSlot.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridResultSlot.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridSource.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridSource.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridSource.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridSource.java index dba56eda7..9ed0828fe 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridSource.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridSource.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridSourceImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridSourceImpl.java similarity index 97% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridSourceImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridSourceImpl.java index 29cc2c3db..97632e507 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridSourceImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridSourceImpl.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.list.ResourceList; import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.util.Comparator; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingMatrix.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingMatrix.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingMatrix.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingMatrix.java index 5ef6b3344..805e53372 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingMatrix.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingMatrix.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingMatrixContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingMatrixContainerMenu.java similarity index 93% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingMatrixContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingMatrixContainerMenu.java index b8ffb621a..288b9c3e8 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingMatrixContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingMatrixContainerMenu.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridBlock.java similarity index 68% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridBlock.java index e3e6ab612..38b96b665 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridBlock.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker; import javax.annotation.Nullable; @@ -21,7 +21,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class GridBlock extends AbstractGridBlock implements BlockItemProvider { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridBlockEntity.java similarity index 75% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridBlockEntity.java index 567277aa9..da2f4aed1 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridBlockEntity.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.ContentNames; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridContainerMenu.java similarity index 62% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridContainerMenu.java index 79b214719..59bff838a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridContainerMenu.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.containermenu.ServerProperty; import net.minecraft.world.entity.player.Inventory; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridData.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridData.java similarity index 81% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridData.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridData.java index 1c1489b2d..a5b8b63aa 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridData.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridData.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.storage.TrackedResourceAmount; import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage.platform.common.storage.StorageCodecs; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.common.storage.StorageCodecs; +import com.refinedmods.refinedstorage.common.support.resource.ResourceCodecs; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridSearchBox.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridSearchBox.java similarity index 79% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridSearchBox.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridSearchBox.java index 8f7f7360c..be4620b64 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridSearchBox.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridSearchBox.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; import java.util.function.Consumer; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridSortingTypes.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridSortingTypes.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridSortingTypes.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridSortingTypes.java index fa7201503..9d38f3f33 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridSortingTypes.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridSortingTypes.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; import com.refinedmods.refinedstorage.api.grid.view.GridResource; import com.refinedmods.refinedstorage.api.grid.view.GridSortingType; import com.refinedmods.refinedstorage.api.grid.view.GridView; import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage.platform.api.grid.view.PlatformGridResource; +import com.refinedmods.refinedstorage.common.api.grid.view.PlatformGridResource; import java.util.Comparator; import java.util.function.Function; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/NoopGridSynchronizer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/NoopGridSynchronizer.java similarity index 85% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/NoopGridSynchronizer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/NoopGridSynchronizer.java index 6dcd2f096..92accb73c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/NoopGridSynchronizer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/NoopGridSynchronizer.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; import javax.annotation.Nullable; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class NoopGridSynchronizer extends AbstractGridSynchronizer { public static final NoopGridSynchronizer INSTANCE = new NoopGridSynchronizer(); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/PortableGridData.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/PortableGridData.java similarity index 75% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/PortableGridData.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/PortableGridData.java index c64433452..614b20daa 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/PortableGridData.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/PortableGridData.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceFactory; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceFactory; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/SecuredGridOperations.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/SecuredGridOperations.java similarity index 85% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/SecuredGridOperations.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/SecuredGridOperations.java index 9f89b1324..2188b738d 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/SecuredGridOperations.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/SecuredGridOperations.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; @@ -6,14 +6,14 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.security.PlatformSecurityNetworkComponent; -import com.refinedmods.refinedstorage.platform.common.security.BuiltinPermission; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.security.PlatformSecurityNetworkComponent; +import com.refinedmods.refinedstorage.common.security.BuiltinPermission; import net.minecraft.network.chat.MutableComponent; import net.minecraft.server.level.ServerPlayer; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class SecuredGridOperations implements GridOperations { private static final MutableComponent CANNOT_EXTRACT_MESSAGE = createTranslation("misc", "no_permission.extract"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/SnapshotCraftingGridRefillContext.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/SnapshotCraftingGridRefillContext.java similarity index 93% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/SnapshotCraftingGridRefillContext.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/SnapshotCraftingGridRefillContext.java index 9e4d2e98b..fe846028b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/SnapshotCraftingGridRefillContext.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/SnapshotCraftingGridRefillContext.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.resource.list.ResourceList; import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGrid.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGrid.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGrid.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGrid.java index 66498bbf4..82f6de4f9 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGrid.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGrid.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; import com.refinedmods.refinedstorage.api.grid.operations.NoopGridOperations; @@ -11,12 +11,12 @@ import com.refinedmods.refinedstorage.api.storage.NoopStorage; import com.refinedmods.refinedstorage.api.storage.Storage; import com.refinedmods.refinedstorage.api.storage.TrackedResourceAmount; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.security.PlatformSecurityNetworkComponent; -import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemSession; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.security.PlatformSecurityNetworkComponent; +import com.refinedmods.refinedstorage.common.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemSession; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceType; import java.util.Collections; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridContainerMenu.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridContainerMenu.java index a7a75ef40..b49be1e0d 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridContainerMenu.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.content.Menus; import net.minecraft.world.entity.player.Inventory; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridData.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridData.java similarity index 66% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridData.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridData.java index b547e00e3..c54c5caac 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridData.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridData.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceFactory; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceFactory; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridExtendedMenuProvider.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridExtendedMenuProvider.java similarity index 77% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridExtendedMenuProvider.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridExtendedMenuProvider.java index e8881f5a0..f66f2720c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridExtendedMenuProvider.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridExtendedMenuProvider.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.support.containermenu.ExtendedMenuProvider; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridItem.java similarity index 68% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridItem.java index e27de441d..dc4bb1da4 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridItem.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage.api.network.impl.energy.EnergyStorageImpl; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.security.SecurityHelper; -import com.refinedmods.refinedstorage.platform.api.support.energy.AbstractNetworkBoundEnergyItem; -import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemSession; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.security.BuiltinPermission; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.security.SecurityHelper; +import com.refinedmods.refinedstorage.common.api.support.energy.AbstractNetworkBoundEnergyItem; +import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemSession; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.security.BuiltinPermission; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.Item; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridOperations.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridOperations.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridOperations.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridOperations.java index 4e7c4f533..031b38d59 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridOperations.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridOperations.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; @@ -7,8 +7,8 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemSession; -import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemSession; class WirelessGridOperations implements GridOperations { private final GridOperations delegate; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/package-info.java new file mode 100644 index 000000000..69ec81607 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.grid; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/AbstractGridScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/AbstractGridScreen.java similarity index 91% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/AbstractGridScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/AbstractGridScreen.java index 1f05da3bd..292af1da4 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/AbstractGridScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/AbstractGridScreen.java @@ -1,24 +1,24 @@ -package com.refinedmods.refinedstorage.platform.common.grid.screen; +package com.refinedmods.refinedstorage.common.grid.screen; import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; import com.refinedmods.refinedstorage.api.grid.view.GridResource; import com.refinedmods.refinedstorage.api.grid.view.GridView; import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage.platform.api.grid.view.PlatformGridResource; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.grid.NoopGridSynchronizer; -import com.refinedmods.refinedstorage.platform.common.grid.view.ItemGridResource; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.DisabledSlot; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage.platform.common.support.stretching.AbstractStretchingScreen; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.SmallTextClientTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.support.widget.History; -import com.refinedmods.refinedstorage.platform.common.support.widget.RedstoneModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.common.api.grid.view.PlatformGridResource; +import com.refinedmods.refinedstorage.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.common.grid.NoopGridSynchronizer; +import com.refinedmods.refinedstorage.common.grid.view.ItemGridResource; +import com.refinedmods.refinedstorage.common.support.containermenu.DisabledSlot; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.stretching.AbstractStretchingScreen; +import com.refinedmods.refinedstorage.common.support.tooltip.SmallTextClientTooltipComponent; +import com.refinedmods.refinedstorage.common.support.widget.History; +import com.refinedmods.refinedstorage.common.support.widget.RedstoneModeSideButtonWidget; import com.refinedmods.refinedstorage.query.lexer.SyntaxHighlighter; import com.refinedmods.refinedstorage.query.lexer.SyntaxHighlighterColors; @@ -28,6 +28,8 @@ import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; import net.minecraft.client.renderer.RenderType; import net.minecraft.network.chat.Component; @@ -39,7 +41,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; import static java.util.Objects.requireNonNullElse; public abstract class AbstractGridScreen extends AbstractStretchingScreen { @@ -231,7 +233,7 @@ private void renderSlot(final GuiGraphics graphics, renderResourceWithAmount(graphics, slotX, slotY, resource); } if (inBounds && isOverStorageArea(mouseX, mouseY)) { - renderSlotHighlight(graphics, slotX, slotY, 0); + AbstractContainerScreen.renderSlotHighlight(graphics, slotX, slotY, 0); if (resource != null) { currentGridSlotIndex = idx; } @@ -418,7 +420,7 @@ private static GridExtractMode getExtractMode(final int clickedButton) { } private static boolean shouldExtractToCursor() { - return !hasShiftDown(); + return !Screen.hasShiftDown(); } @Override @@ -462,7 +464,7 @@ private void mouseScrolledInGrid(final boolean up, final PlatformGridResource re @Nullable private static GridScrollMode getScrollModeWhenScrollingOnInventoryArea(final boolean up) { - if (hasShiftDown()) { + if (Screen.hasShiftDown()) { return up ? GridScrollMode.INVENTORY_TO_GRID : GridScrollMode.GRID_TO_INVENTORY; } return null; @@ -470,8 +472,8 @@ private static GridScrollMode getScrollModeWhenScrollingOnInventoryArea(final bo @Nullable private static GridScrollMode getScrollModeWhenScrollingOnGridArea(final boolean up) { - final boolean shift = hasShiftDown(); - final boolean ctrl = hasControlDown(); + final boolean shift = Screen.hasShiftDown(); + final boolean ctrl = Screen.hasControlDown(); if (shift && ctrl) { return null; } @@ -506,7 +508,7 @@ public boolean charTyped(final char unknown1, final int unknown2) { public boolean keyPressed(final int key, final int scanCode, final int modifiers) { // First check if we have to prevent sorting. // Order matters. In auto-selected mode, the search field will swallow the SHIFT key. - if (hasShiftDown() && Platform.INSTANCE.getConfig().getGrid().isPreventSortingWhileShiftIsDown()) { + if (Screen.hasShiftDown() && Platform.INSTANCE.getConfig().getGrid().isPreventSortingWhileShiftIsDown()) { getMenu().getView().setPreventSorting(true); } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/AutoSelectedSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/AutoSelectedSideButtonWidget.java similarity index 69% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/AutoSelectedSideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/AutoSelectedSideButtonWidget.java index e63560600..754bb73e2 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/AutoSelectedSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/AutoSelectedSideButtonWidget.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.grid.screen; +package com.refinedmods.refinedstorage.common.grid.screen; -import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.common.support.widget.AbstractSideButtonWidget; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.NO; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.YES; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.NO; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.YES; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; class AutoSelectedSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "grid.auto_selected"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/CraftingGridScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/CraftingGridScreen.java similarity index 91% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/CraftingGridScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/CraftingGridScreen.java index 6e0a34a76..fdfb4a045 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/CraftingGridScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/CraftingGridScreen.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.grid.screen; +package com.refinedmods.refinedstorage.common.grid.screen; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.KeyMappings; -import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridMatrixCloseBehavior; -import com.refinedmods.refinedstorage.platform.common.support.widget.HoveredImageButton; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.content.KeyMappings; +import com.refinedmods.refinedstorage.common.grid.CraftingGridContainerMenu; +import com.refinedmods.refinedstorage.common.grid.CraftingGridMatrixCloseBehavior; +import com.refinedmods.refinedstorage.common.support.widget.HoveredImageButton; import javax.annotation.Nullable; @@ -21,8 +21,8 @@ import net.minecraft.world.inventory.ResultContainer; import net.minecraft.world.inventory.Slot; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class CraftingGridScreen extends AbstractGridScreen { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/crafting_grid.png"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/GridScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/GridScreen.java similarity index 72% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/GridScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/GridScreen.java index d9c181d29..58cb19f21 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/GridScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/GridScreen.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.grid.screen; +package com.refinedmods.refinedstorage.common.grid.screen; -import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.common.grid.AbstractGridContainerMenu; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public class GridScreen extends AbstractGridScreen { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/grid.png"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/GridSearchBoxWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/GridSearchBoxWidget.java similarity index 92% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/GridSearchBoxWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/GridSearchBoxWidget.java index 996556dad..94f5ac1ac 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/GridSearchBoxWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/GridSearchBoxWidget.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.grid.screen; +package com.refinedmods.refinedstorage.common.grid.screen; -import com.refinedmods.refinedstorage.platform.common.grid.GridSearchBox; -import com.refinedmods.refinedstorage.platform.common.support.widget.History; -import com.refinedmods.refinedstorage.platform.common.support.widget.SearchFieldWidget; +import com.refinedmods.refinedstorage.common.grid.GridSearchBox; +import com.refinedmods.refinedstorage.common.support.widget.History; +import com.refinedmods.refinedstorage.common.support.widget.SearchFieldWidget; import com.refinedmods.refinedstorage.query.lexer.Lexer; import com.refinedmods.refinedstorage.query.lexer.LexerException; import com.refinedmods.refinedstorage.query.lexer.LexerTokenMappings; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/LastModified.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/LastModified.java similarity index 94% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/LastModified.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/LastModified.java index f6a27b200..f37d920b9 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/LastModified.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/LastModified.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.grid.screen; +package com.refinedmods.refinedstorage.common.grid.screen; record LastModified(Type type, long amount) { private static final long SECOND = 1000; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/ResourceTypeSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/ResourceTypeSideButtonWidget.java similarity index 80% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/ResourceTypeSideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/ResourceTypeSideButtonWidget.java index 7075678c0..bb6295282 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/ResourceTypeSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/ResourceTypeSideButtonWidget.java @@ -1,15 +1,15 @@ -package com.refinedmods.refinedstorage.platform.common.grid.screen; +package com.refinedmods.refinedstorage.common.grid.screen; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.TextureIds; -import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.common.support.TextureIds; +import com.refinedmods.refinedstorage.common.support.widget.AbstractSideButtonWidget; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; class ResourceTypeSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "grid.resource_type"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/SortingDirectionSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/SortingDirectionSideButtonWidget.java similarity index 83% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/SortingDirectionSideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/SortingDirectionSideButtonWidget.java index 1bdbec690..d51967514 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/SortingDirectionSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/SortingDirectionSideButtonWidget.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.grid.screen; +package com.refinedmods.refinedstorage.common.grid.screen; import com.refinedmods.refinedstorage.api.grid.view.GridSortingDirection; -import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.common.support.widget.AbstractSideButtonWidget; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; class SortingDirectionSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "grid.sorting.direction"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/SortingTypeSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/SortingTypeSideButtonWidget.java similarity index 83% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/SortingTypeSideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/SortingTypeSideButtonWidget.java index dd8401fea..b3bfe2f28 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/SortingTypeSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/SortingTypeSideButtonWidget.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.grid.screen; +package com.refinedmods.refinedstorage.common.grid.screen; -import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.grid.GridSortingTypes; -import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.common.grid.GridSortingTypes; +import com.refinedmods.refinedstorage.common.support.widget.AbstractSideButtonWidget; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; class SortingTypeSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "grid.sorting.type"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/SynchronizationSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/SynchronizationSideButtonWidget.java similarity index 79% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/SynchronizationSideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/SynchronizationSideButtonWidget.java index 22e750947..e1a1b2522 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/SynchronizationSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/SynchronizationSideButtonWidget.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.grid.screen; +package com.refinedmods.refinedstorage.common.grid.screen; -import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.common.support.widget.AbstractSideButtonWidget; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; class SynchronizationSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "grid.synchronizer"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/FluidGridInsertionHint.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/hint/FluidGridInsertionHint.java similarity index 58% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/FluidGridInsertionHint.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/hint/FluidGridInsertionHint.java index 056e872f7..8eaa8d5de 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/FluidGridInsertionHint.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/hint/FluidGridInsertionHint.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.grid.screen.hint; +package com.refinedmods.refinedstorage.common.grid.screen.hint; -import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHint; -import com.refinedmods.refinedstorage.platform.api.support.resource.FluidOperationResult; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceRendering; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseClientTooltipComponent; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.grid.GridInsertionHint; +import com.refinedmods.refinedstorage.common.api.support.resource.FluidOperationResult; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.FluidResourceRendering; +import com.refinedmods.refinedstorage.common.support.tooltip.MouseClientTooltipComponent; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/GridInsertionHintsImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/hint/GridInsertionHintsImpl.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/GridInsertionHintsImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/hint/GridInsertionHintsImpl.java index 6f40c722b..f6be9f8a7 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/GridInsertionHintsImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/hint/GridInsertionHintsImpl.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.grid.screen.hint; +package com.refinedmods.refinedstorage.common.grid.screen.hint; -import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHint; -import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHints; +import com.refinedmods.refinedstorage.common.api.grid.GridInsertionHint; +import com.refinedmods.refinedstorage.common.api.grid.GridInsertionHints; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/ItemGridInsertionHint.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/hint/ItemGridInsertionHint.java similarity index 63% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/ItemGridInsertionHint.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/hint/ItemGridInsertionHint.java index fcc21730a..819e6f36a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/ItemGridInsertionHint.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/hint/ItemGridInsertionHint.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.grid.screen.hint; +package com.refinedmods.refinedstorage.common.grid.screen.hint; -import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHint; -import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseClientTooltipComponent; +import com.refinedmods.refinedstorage.common.api.grid.GridInsertionHint; +import com.refinedmods.refinedstorage.common.api.support.AmountFormatting; +import com.refinedmods.refinedstorage.common.support.tooltip.MouseClientTooltipComponent; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/SingleItemGridInsertionHint.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/hint/SingleItemGridInsertionHint.java similarity index 66% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/SingleItemGridInsertionHint.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/hint/SingleItemGridInsertionHint.java index f870bdb8e..afcf475b0 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/SingleItemGridInsertionHint.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/hint/SingleItemGridInsertionHint.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.grid.screen.hint; +package com.refinedmods.refinedstorage.common.grid.screen.hint; -import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHint; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseClientTooltipComponent; +import com.refinedmods.refinedstorage.common.api.grid.GridInsertionHint; +import com.refinedmods.refinedstorage.common.support.tooltip.MouseClientTooltipComponent; import java.util.Optional; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/hint/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/hint/package-info.java new file mode 100644 index 000000000..c8ec48ffa --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/hint/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.grid.screen.hint; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/package-info.java new file mode 100644 index 000000000..533df2801 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.grid.screen; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridExtractionStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/ClientGridExtractionStrategy.java similarity index 57% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridExtractionStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/ClientGridExtractionStrategy.java index 0bab9aa80..40f25bc86 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridExtractionStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/ClientGridExtractionStrategy.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.grid.strategy; +package com.refinedmods.refinedstorage.common.grid.strategy; import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.support.packet.c2s.C2SPackets; public class ClientGridExtractionStrategy implements GridExtractionStrategy { @Override diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridInsertionStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/ClientGridInsertionStrategy.java similarity index 66% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridInsertionStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/ClientGridInsertionStrategy.java index a09384403..8a46b53ec 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridInsertionStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/ClientGridInsertionStrategy.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.grid.strategy; +package com.refinedmods.refinedstorage.common.grid.strategy; import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.common.support.packet.c2s.C2SPackets; public class ClientGridInsertionStrategy implements GridInsertionStrategy { @Override diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/ClientGridScrollingStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/ClientGridScrollingStrategy.java new file mode 100644 index 000000000..fb2d403c1 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/ClientGridScrollingStrategy.java @@ -0,0 +1,14 @@ +package com.refinedmods.refinedstorage.common.grid.strategy; + +import com.refinedmods.refinedstorage.common.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.support.packet.c2s.C2SPackets; + +public class ClientGridScrollingStrategy implements GridScrollingStrategy { + @Override + public boolean onScroll(final PlatformResourceKey resource, final GridScrollMode scrollMode, final int slotIndex) { + C2SPackets.sendGridScroll(resource, scrollMode, slotIndex); + return true; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/CompositeGridExtractionStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/CompositeGridExtractionStrategy.java similarity index 77% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/CompositeGridExtractionStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/CompositeGridExtractionStrategy.java index 7c037c2ed..03e89b227 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/CompositeGridExtractionStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/CompositeGridExtractionStrategy.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.grid.strategy; +package com.refinedmods.refinedstorage.common.grid.strategy; import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; import java.util.Collections; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/CompositeGridInsertionStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/CompositeGridInsertionStrategy.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/CompositeGridInsertionStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/CompositeGridInsertionStrategy.java index 3054f689d..4761fdcc5 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/CompositeGridInsertionStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/CompositeGridInsertionStrategy.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.grid.strategy; +package com.refinedmods.refinedstorage.common.grid.strategy; import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategy; import java.util.Collections; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/CompositeGridScrollingStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/CompositeGridScrollingStrategy.java similarity index 69% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/CompositeGridScrollingStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/CompositeGridScrollingStrategy.java index 540144706..e9ab9410a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/CompositeGridScrollingStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/CompositeGridScrollingStrategy.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.grid.strategy; +package com.refinedmods.refinedstorage.common.grid.strategy; -import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; import java.util.Collections; import java.util.List; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/package-info.java similarity index 77% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/package-info.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/package-info.java index 12ffffcb9..284474eca 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/package-info.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/strategy/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.support; +package com.refinedmods.refinedstorage.common.grid.strategy; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/AbstractFluidGridResourceFactory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/AbstractFluidGridResourceFactory.java similarity index 92% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/AbstractFluidGridResourceFactory.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/AbstractFluidGridResourceFactory.java index d19faef65..76083fcfe 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/AbstractFluidGridResourceFactory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/AbstractFluidGridResourceFactory.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.grid.view; +package com.refinedmods.refinedstorage.common.grid.view; import com.refinedmods.refinedstorage.api.grid.view.GridResource; import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; import java.util.Optional; import java.util.Set; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/AbstractItemGridResourceFactory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/AbstractItemGridResourceFactory.java similarity index 93% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/AbstractItemGridResourceFactory.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/AbstractItemGridResourceFactory.java index 70b1347a8..ad6b897bd 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/AbstractItemGridResourceFactory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/AbstractItemGridResourceFactory.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.grid.view; +package com.refinedmods.refinedstorage.common.grid.view; import com.refinedmods.refinedstorage.api.grid.view.GridResource; import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.util.Optional; import java.util.Set; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/CompositeGridResourceFactory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/CompositeGridResourceFactory.java similarity index 77% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/CompositeGridResourceFactory.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/CompositeGridResourceFactory.java index 858b7d855..fe82452de 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/CompositeGridResourceFactory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/CompositeGridResourceFactory.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.grid.view; +package com.refinedmods.refinedstorage.common.grid.view; import com.refinedmods.refinedstorage.api.grid.view.GridResource; import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.platform.api.support.registry.PlatformRegistry; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.common.api.support.registry.PlatformRegistry; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceType; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/FluidGridResource.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/FluidGridResource.java similarity index 77% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/FluidGridResource.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/FluidGridResource.java index c69511d5e..bd042f156 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/FluidGridResource.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/FluidGridResource.java @@ -1,17 +1,17 @@ -package com.refinedmods.refinedstorage.platform.common.grid.view; +package com.refinedmods.refinedstorage.common.grid.view; import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.platform.api.grid.GridResourceAttributeKeys; -import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage.platform.api.grid.view.AbstractPlatformGridResource; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceRendering; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseClientTooltipComponent; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.grid.GridResourceAttributeKeys; +import com.refinedmods.refinedstorage.common.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.common.api.grid.view.AbstractPlatformGridResource; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.FluidResourceRendering; +import com.refinedmods.refinedstorage.common.support.tooltip.MouseClientTooltipComponent; import java.util.List; import java.util.Map; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/ItemGridResource.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/ItemGridResource.java similarity index 82% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/ItemGridResource.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/ItemGridResource.java index 1cc3ce84f..da0b5d98c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/ItemGridResource.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/ItemGridResource.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.common.grid.view; +package com.refinedmods.refinedstorage.common.grid.view; import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.platform.api.grid.GridResourceAttributeKeys; -import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage.platform.api.grid.view.AbstractPlatformGridResource; -import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseClientTooltipComponent; +import com.refinedmods.refinedstorage.common.api.grid.GridResourceAttributeKeys; +import com.refinedmods.refinedstorage.common.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.common.api.grid.view.AbstractPlatformGridResource; +import com.refinedmods.refinedstorage.common.api.support.AmountFormatting; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.tooltip.MouseClientTooltipComponent; import java.util.List; import java.util.Map; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/package-info.java new file mode 100644 index 000000000..042dfcbd4 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.grid.view; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/ExportedResourcesContainer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/ExportedResourcesContainer.java similarity index 87% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/ExportedResourcesContainer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/ExportedResourcesContainer.java index 29fa88f85..d2f7e0756 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/ExportedResourcesContainer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/ExportedResourcesContainer.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.iface; +package com.refinedmods.refinedstorage.common.iface; import com.refinedmods.refinedstorage.api.network.impl.node.iface.InterfaceExportState; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.storage.channel.FuzzyStorageChannel; -import com.refinedmods.refinedstorage.platform.api.support.resource.FuzzyModeNormalizer; -import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.storage.channel.FuzzyStorageChannel; +import com.refinedmods.refinedstorage.common.api.support.resource.FuzzyModeNormalizer; +import com.refinedmods.refinedstorage.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; import java.util.Collection; import java.util.Collections; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceBlock.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceBlock.java index 7b4140f49..2f5f0531c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceBlock.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.iface; +package com.refinedmods.refinedstorage.common.iface; -import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseBlock; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.common.content.BlockConstants; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.support.AbstractBaseBlock; +import com.refinedmods.refinedstorage.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker; import javax.annotation.Nullable; @@ -22,7 +22,7 @@ import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BooleanProperty; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class InterfaceBlock extends AbstractBaseBlock implements EntityBlock { private static final Component HELP = createTranslation("item", "interface.help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceBlockEntity.java similarity index 86% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceBlockEntity.java index d9b59f72e..7bcae875f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceBlockEntity.java @@ -1,21 +1,21 @@ -package com.refinedmods.refinedstorage.platform.common.iface; +package com.refinedmods.refinedstorage.common.iface; import com.refinedmods.refinedstorage.api.network.impl.node.iface.InterfaceNetworkNode; import com.refinedmods.refinedstorage.api.network.impl.node.iface.externalstorage.InterfaceExternalStorageProvider; import com.refinedmods.refinedstorage.api.network.impl.node.iface.externalstorage.InterfaceExternalStorageProviderImpl; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.support.BlockEntityWithDrops; -import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.support.BlockEntityWithDrops; +import com.refinedmods.refinedstorage.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceContainerMenu.java similarity index 79% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceContainerMenu.java index 938a121d2..7903259b0 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceContainerMenu.java @@ -1,15 +1,15 @@ -package com.refinedmods.refinedstorage.platform.common.iface; +package com.refinedmods.refinedstorage.common.iface; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlot; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlotType; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.containermenu.ResourceSlot; +import com.refinedmods.refinedstorage.common.support.containermenu.ResourceSlotType; +import com.refinedmods.refinedstorage.common.support.containermenu.ServerProperty; import net.minecraft.network.chat.Component; import net.minecraft.world.Container; @@ -17,7 +17,7 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.Slot; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class InterfaceContainerMenu extends AbstractResourceContainerMenu { private static final int EXPORT_CONFIG_SLOT_X = 8; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceData.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceData.java similarity index 78% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceData.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceData.java index e731c9e58..e3bbfdf69 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceData.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceData.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.iface; +package com.refinedmods.refinedstorage.common.iface; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfacePlatformExternalStorageProviderFactory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfacePlatformExternalStorageProviderFactory.java similarity index 83% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfacePlatformExternalStorageProviderFactory.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfacePlatformExternalStorageProviderFactory.java index f0fd2a288..27120e408 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfacePlatformExternalStorageProviderFactory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfacePlatformExternalStorageProviderFactory.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.iface; +package com.refinedmods.refinedstorage.common.iface; import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; -import com.refinedmods.refinedstorage.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.common.api.storage.externalstorage.PlatformExternalStorageProviderFactory; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceProxyExternalStorageProvider.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceProxyExternalStorageProvider.java similarity index 97% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceProxyExternalStorageProvider.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceProxyExternalStorageProvider.java index ba1e7d91d..4bb24e7f3 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceProxyExternalStorageProvider.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceProxyExternalStorageProvider.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.iface; +package com.refinedmods.refinedstorage.common.iface; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.impl.node.iface.InterfaceNetworkNode; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceScreen.java similarity index 68% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceScreen.java index 2d8ca7b47..0552383c7 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceScreen.java @@ -1,15 +1,15 @@ -package com.refinedmods.refinedstorage.platform.common.iface; +package com.refinedmods.refinedstorage.common.iface; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.widget.FuzzyModeSideButtonWidget; -import com.refinedmods.refinedstorage.platform.common.support.widget.RedstoneModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.widget.FuzzyModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.widget.RedstoneModeSideButtonWidget; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public class InterfaceScreen extends AbstractBaseScreen { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/interface.png"); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/package-info.java new file mode 100644 index 000000000..daf131302 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.iface; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterBlock.java similarity index 73% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterBlock.java index 6932cff56..979e08309 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterBlock.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.common.importer; +package com.refinedmods.refinedstorage.common.importer; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalCableBlock; -import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage.platform.common.support.ColorableBlock; -import com.refinedmods.refinedstorage.platform.common.support.DirectionalCableBlockShapes; -import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.AbstractDirectionalCableBlock; +import com.refinedmods.refinedstorage.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.common.support.ColorableBlock; +import com.refinedmods.refinedstorage.common.support.DirectionalCableBlockShapes; +import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker; import java.util.HashMap; import java.util.Map; @@ -29,7 +29,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.shapes.VoxelShape; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class ImporterBlock extends AbstractDirectionalCableBlock implements ColorableBlock, EntityBlock, BlockItemProvider { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterBlockEntity.java similarity index 82% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterBlockEntity.java index eec1924d5..a5aae36f9 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterBlockEntity.java @@ -1,24 +1,24 @@ -package com.refinedmods.refinedstorage.platform.common.importer; +package com.refinedmods.refinedstorage.common.importer; import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterNetworkNode; import com.refinedmods.refinedstorage.api.network.node.importer.ImporterTransferStrategy; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.api.importer.ImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.FilterModeSettings; -import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage.platform.common.support.network.AbstractUpgradeableNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.importer.ImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.FilterModeSettings; +import com.refinedmods.refinedstorage.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.support.network.AbstractUpgradeableNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations; import java.util.List; import java.util.Set; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterContainerMenu.java similarity index 69% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterContainerMenu.java index 3f8c687ff..eabe0b571 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterContainerMenu.java @@ -1,22 +1,22 @@ -package com.refinedmods.refinedstorage.platform.common.importer; +package com.refinedmods.refinedstorage.common.importer; import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractSimpleFilterContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.containermenu.AbstractSimpleFilterContainerMenu; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class ImporterContainerMenu extends AbstractSimpleFilterContainerMenu { private static final MutableComponent FILTER_HELP = createTranslation("gui", "importer.filter_help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterScreen.java similarity index 62% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterScreen.java index 6527cdcfd..039c5ffd0 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterScreen.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.importer; +package com.refinedmods.refinedstorage.common.importer; -import com.refinedmods.refinedstorage.platform.common.storage.FilterModeSideButtonWidget; -import com.refinedmods.refinedstorage.platform.common.support.AbstractFilterScreen; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.widget.FuzzyModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.storage.FilterModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.AbstractFilterScreen; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.widget.FuzzyModeSideButtonWidget; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class ImporterScreen extends AbstractFilterScreen { public ImporterScreen(final ImporterContainerMenu menu, final Inventory playerInventory, final Component text) { diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/package-info.java new file mode 100644 index 000000000..d7891b8c5 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.importer; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/ProcessorItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/misc/ProcessorItem.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/ProcessorItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/misc/ProcessorItem.java index 48310f713..2072e425e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/ProcessorItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/misc/ProcessorItem.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.misc; +package com.refinedmods.refinedstorage.common.misc; import net.minecraft.world.item.Item; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/WrenchItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/misc/WrenchItem.java similarity index 70% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/WrenchItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/misc/WrenchItem.java index 4b2db240a..c7d0b5c4d 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/WrenchItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/misc/WrenchItem.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.misc; +package com.refinedmods.refinedstorage.common.misc; -import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; import java.util.Optional; @@ -9,7 +9,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class WrenchItem extends Item { private static final Component HELP = createTranslation("item", "wrench.help"); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/misc/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/misc/package-info.java new file mode 100644 index 000000000..1a262c36d --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/misc/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.misc; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/CableBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/CableBlock.java similarity index 78% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/CableBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/CableBlock.java index b2f172125..0cb1547c1 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/CableBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/CableBlock.java @@ -1,20 +1,20 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage.platform.common.support.AbstractColoredBlock; -import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.CableBlockSupport; -import com.refinedmods.refinedstorage.platform.common.support.CableShapeCacheKey; -import com.refinedmods.refinedstorage.platform.common.support.ColorableBlock; -import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.network.BaseNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.BlockConstants; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.AbstractColoredBlock; +import com.refinedmods.refinedstorage.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.common.support.CableBlockSupport; +import com.refinedmods.refinedstorage.common.support.CableShapeCacheKey; +import com.refinedmods.refinedstorage.common.support.ColorableBlock; +import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.common.support.network.BaseNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker; import javax.annotation.Nullable; @@ -42,7 +42,7 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class CableBlock extends AbstractColoredBlock implements ColorableBlock, SimpleWaterloggedBlock, EntityBlock { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkCardInventory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkCardInventory.java similarity index 82% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkCardInventory.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkCardInventory.java index 3f5ee36ac..ed0fbb650 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkCardInventory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkCardInventory.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; -import com.refinedmods.refinedstorage.platform.common.support.FilteredContainer; +import com.refinedmods.refinedstorage.common.support.FilteredContainer; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkCardItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkCardItem.java similarity index 86% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkCardItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkCardItem.java index 4e464daec..956b907fc 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkCardItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkCardItem.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; -import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.content.DataComponents; +import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.common.content.DataComponents; import java.util.List; import java.util.Optional; @@ -24,8 +24,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage.platform.common.networking.NetworkReceiverKey.getDimensionName; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class NetworkCardItem extends Item { private static final MutableComponent UNBOUND_HELP = createTranslation("item", "network_card.unbound_help"); @@ -56,7 +55,7 @@ public InteractionResult useOn(final UseOnContext ctx) { pos.getX(), pos.getY(), pos.getZ(), - getDimensionName(dimension).withStyle(ChatFormatting.YELLOW) + NetworkReceiverKey.getDimensionName(dimension).withStyle(ChatFormatting.YELLOW) )); return InteractionResult.CONSUME; } @@ -84,7 +83,7 @@ public void appendHoverText(final ItemStack stack, location.pos().getX(), location.pos().getY(), location.pos().getZ(), - getDimensionName(location.dimension()).withStyle(ChatFormatting.YELLOW) + NetworkReceiverKey.getDimensionName(location.dimension()).withStyle(ChatFormatting.YELLOW) ).withStyle(ChatFormatting.GRAY)), () -> lines.add(UNBOUND)); } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkCardItemPropertyFunction.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkCardItemPropertyFunction.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkCardItemPropertyFunction.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkCardItemPropertyFunction.java index 516aad278..4a6f42574 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkCardItemPropertyFunction.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkCardItemPropertyFunction.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; import javax.annotation.Nullable; @@ -8,7 +8,7 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public class NetworkCardItemPropertyFunction implements ClampedItemPropertyFunction { public static final ResourceLocation NAME = createIdentifier("network_card_active"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkReceiverBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkReceiverBlock.java similarity index 74% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkReceiverBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkReceiverBlock.java index 2db3e34a5..dbe5bea6c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkReceiverBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkReceiverBlock.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage.platform.common.support.AbstractColoredBlock; -import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.BlockConstants; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.AbstractColoredBlock; +import com.refinedmods.refinedstorage.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker; import javax.annotation.Nullable; @@ -26,7 +26,7 @@ import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BooleanProperty; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class NetworkReceiverBlock extends AbstractColoredBlock implements EntityBlock { public static final BooleanProperty ACTIVE = BooleanProperty.create("active"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkReceiverBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkReceiverBlockEntity.java similarity index 66% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkReceiverBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkReceiverBlockEntity.java index 17d081a53..d4b7ec837 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkReceiverBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkReceiverBlockEntity.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.support.network.BaseNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.support.network.BaseNetworkNodeContainerBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkReceiverKey.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkReceiverKey.java similarity index 94% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkReceiverKey.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkReceiverKey.java index 285839a48..59757b89c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkReceiverKey.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkReceiverKey.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; import net.minecraft.core.BlockPos; import net.minecraft.core.GlobalPos; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterBlock.java similarity index 78% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterBlock.java index f62f18ab1..20d02eb82 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterBlock.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage.platform.common.support.AbstractColoredBlock; -import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.BlockConstants; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.AbstractColoredBlock; +import com.refinedmods.refinedstorage.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem; import javax.annotation.Nullable; @@ -24,7 +24,7 @@ import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.EnumProperty; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class NetworkTransmitterBlock extends AbstractColoredBlock implements EntityBlock { public static final EnumProperty STATE = EnumProperty.create( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterBlockEntity.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterBlockEntity.java index f60dea301..5e7d1c5e2 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterBlockEntity.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; import com.refinedmods.refinedstorage.api.network.node.GraphNetworkComponent; -import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionSink; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.support.BlockEntityWithDrops; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.util.ContainerUtil; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.support.BlockEntityWithDrops; +import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.util.ContainerUtil; import javax.annotation.Nullable; @@ -33,7 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class NetworkTransmitterBlockEntity extends AbstractRedstoneModeNetworkNodeContainerBlockEntity diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterBlockEntityTicker.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterBlockEntityTicker.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterBlockEntityTicker.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterBlockEntityTicker.java index 1aaf07035..cfb229bcf 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterBlockEntityTicker.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterBlockEntityTicker.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker; import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterContainerMenu.java similarity index 80% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterContainerMenu.java index efb7ef849..33538c0eb 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterContainerMenu.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ValidatedSlot; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.S2CPackets; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.ValidatedSlot; +import com.refinedmods.refinedstorage.common.support.packet.s2c.S2CPackets; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterData.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterData.java similarity index 93% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterData.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterData.java index 0b9fe6fc8..3211a3423 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterData.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterData.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterScreen.java similarity index 75% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterScreen.java index 4cef74c83..a7e208be0 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterScreen.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage.platform.common.support.TextureIds; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.widget.RedstoneModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.common.support.TextureIds; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.widget.RedstoneModeSideButtonWidget; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public class NetworkTransmitterScreen extends AbstractBaseScreen { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/network_transmitter.png"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterState.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterState.java similarity index 85% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterState.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterState.java index e42adfd79..a8a151444 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterState.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterState.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; import net.minecraft.util.StringRepresentable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayBlock.java similarity index 65% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayBlock.java index d43f51659..b2e8e308b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayBlock.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.support.AbstractActiveColoredDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage.platform.common.support.direction.DefaultDirectionType; -import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; -import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.BlockConstants; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.support.AbstractActiveColoredDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.common.support.direction.DefaultDirectionType; +import com.refinedmods.refinedstorage.common.support.direction.DirectionType; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker; import javax.annotation.Nullable; @@ -26,7 +26,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class RelayBlock extends AbstractActiveColoredDirectionalBlock implements EntityBlock, BlockItemProvider { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayBlockEntity.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayBlockEntity.java index f29f25142..66c99723f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayBlockEntity.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; import com.refinedmods.refinedstorage.api.network.impl.node.relay.RelayComponentType; import com.refinedmods.refinedstorage.api.network.impl.node.relay.RelayInputNetworkNode; @@ -6,18 +6,18 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; import com.refinedmods.refinedstorage.api.storage.AccessMode; -import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.storage.AccessModeSettings; -import com.refinedmods.refinedstorage.platform.common.support.FilterModeSettings; -import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.storage.AccessModeSettings; +import com.refinedmods.refinedstorage.common.support.FilterModeSettings; +import com.refinedmods.refinedstorage.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; import java.util.HashSet; import java.util.Set; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayContainerMenu.java similarity index 85% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayContainerMenu.java index 02465c1ab..d56e2f116 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayContainerMenu.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; import com.refinedmods.refinedstorage.api.storage.AccessMode; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.storage.StoragePropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractSimpleFilterContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.storage.StoragePropertyTypes; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.containermenu.AbstractSimpleFilterContainerMenu; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; import javax.annotation.Nullable; @@ -18,7 +18,7 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class RelayContainerMenu extends AbstractSimpleFilterContainerMenu { private static final MutableComponent FILTER_HELP = createTranslation("gui", "relay.filter_help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayInputNetworkNodeContainer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayInputNetworkNodeContainer.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayInputNetworkNodeContainer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayInputNetworkNodeContainer.java index 93c70bad6..b7bbfc560 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayInputNetworkNodeContainer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayInputNetworkNodeContainer.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; import com.refinedmods.refinedstorage.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionSink; -import com.refinedmods.refinedstorage.platform.common.support.network.InWorldNetworkNodeContainerImpl; +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.common.support.network.InWorldNetworkNodeContainerImpl; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayOutputNetworkNodeContainer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayOutputNetworkNodeContainer.java similarity index 86% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayOutputNetworkNodeContainer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayOutputNetworkNodeContainer.java index da0ee9be3..060ac85d5 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayOutputNetworkNodeContainer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayOutputNetworkNodeContainer.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; import com.refinedmods.refinedstorage.api.network.impl.node.relay.RelayOutputNetworkNode; -import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionSink; -import com.refinedmods.refinedstorage.platform.common.support.network.InWorldNetworkNodeContainerImpl; +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.common.support.network.InWorldNetworkNodeContainerImpl; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassEnergySideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayPassEnergySideButtonWidget.java similarity index 69% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassEnergySideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayPassEnergySideButtonWidget.java index 023e1e6b7..177a22d92 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassEnergySideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayPassEnergySideButtonWidget.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractYesNoSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.widget.AbstractYesNoSideButtonWidget; import javax.annotation.Nullable; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; class RelayPassEnergySideButtonWidget extends AbstractYesNoSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "relay.pass_energy"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassSecuritySideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayPassSecuritySideButtonWidget.java similarity index 69% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassSecuritySideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayPassSecuritySideButtonWidget.java index 77b236435..0c920d309 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassSecuritySideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayPassSecuritySideButtonWidget.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractYesNoSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.widget.AbstractYesNoSideButtonWidget; import javax.annotation.Nullable; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; class RelayPassSecuritySideButtonWidget extends AbstractYesNoSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "relay.pass_security"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassStorageSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayPassStorageSideButtonWidget.java similarity index 69% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassStorageSideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayPassStorageSideButtonWidget.java index db2b50904..a472a33a0 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassStorageSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayPassStorageSideButtonWidget.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractYesNoSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.widget.AbstractYesNoSideButtonWidget; import javax.annotation.Nullable; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; class RelayPassStorageSideButtonWidget extends AbstractYesNoSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "relay.pass_storage"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassThroughSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayPassThroughSideButtonWidget.java similarity index 69% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassThroughSideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayPassThroughSideButtonWidget.java index da4be54fe..dde6d2149 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassThroughSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayPassThroughSideButtonWidget.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractYesNoSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.widget.AbstractYesNoSideButtonWidget; import javax.annotation.Nullable; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; class RelayPassThroughSideButtonWidget extends AbstractYesNoSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "relay.pass_through"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPropertyTypes.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayPropertyTypes.java similarity index 64% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPropertyTypes.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayPropertyTypes.java index 8fa986184..d39d23bd7 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPropertyTypes.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayPropertyTypes.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyType; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyType; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; final class RelayPropertyTypes { static final PropertyType PASS_THROUGH = PropertyTypes.createBooleanProperty( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayScreen.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayScreen.java index b88c74bf3..7fc06e1d4 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayScreen.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.networking; +package com.refinedmods.refinedstorage.common.networking; -import com.refinedmods.refinedstorage.platform.common.storage.AccessModeSideButtonWidget; -import com.refinedmods.refinedstorage.platform.common.storage.FilterModeSideButtonWidget; -import com.refinedmods.refinedstorage.platform.common.storage.PrioritySideButtonWidget; -import com.refinedmods.refinedstorage.platform.common.storage.StoragePropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.AbstractFilterScreen; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; -import com.refinedmods.refinedstorage.platform.common.support.widget.FuzzyModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.storage.AccessModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.storage.FilterModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.storage.PrioritySideButtonWidget; +import com.refinedmods.refinedstorage.common.storage.StoragePropertyTypes; +import com.refinedmods.refinedstorage.common.support.AbstractFilterScreen; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.widget.FuzzyModeSideButtonWidget; import javax.annotation.Nullable; @@ -15,7 +15,7 @@ import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class RelayScreen extends AbstractFilterScreen implements RelayContainerMenu.PassThroughListener { diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/package-info.java new file mode 100644 index 000000000..35bc5c3aa --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.networking; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/package-info.java new file mode 100644 index 000000000..28c9e092a --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/AbstractSecurityCardContainerMenu.java similarity index 89% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/AbstractSecurityCardContainerMenu.java index 8c1e864d4..49f272ded 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/AbstractSecurityCardContainerMenu.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; -import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; -import com.refinedmods.refinedstorage.platform.common.support.stretching.ScreenSizeListener; +import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage.common.support.packet.c2s.C2SPackets; +import com.refinedmods.refinedstorage.common.support.stretching.ScreenSizeListener; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardExtendedMenuProvider.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/AbstractSecurityCardExtendedMenuProvider.java similarity index 78% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardExtendedMenuProvider.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/AbstractSecurityCardExtendedMenuProvider.java index 7717d2280..5d6bbda48 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardExtendedMenuProvider.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/AbstractSecurityCardExtendedMenuProvider.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.common.support.containermenu.ExtendedMenuProvider; import java.util.List; import java.util.Set; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/AbstractSecurityCardItem.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/AbstractSecurityCardItem.java index 4431ace77..5d3893f39 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/AbstractSecurityCardItem.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; import com.refinedmods.refinedstorage.api.network.security.Permission; import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage.platform.api.security.SecurityPolicyContainerItem; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.DataComponents; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.common.api.security.SecurityPolicyContainerItem; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.content.DataComponents; import java.util.HashSet; import java.util.List; @@ -27,7 +27,7 @@ import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; abstract class AbstractSecurityCardItem extends Item implements SecurityPolicyContainerItem { protected AbstractSecurityCardItem(final Properties properties) { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/AbstractSecurityCardScreen.java similarity index 94% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/AbstractSecurityCardScreen.java index 98697e556..381c51cff 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/AbstractSecurityCardScreen.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; -import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage.platform.common.support.stretching.AbstractStretchingScreen; -import com.refinedmods.refinedstorage.platform.common.support.widget.CustomCheckboxWidget; +import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.common.support.stretching.AbstractStretchingScreen; +import com.refinedmods.refinedstorage.common.support.widget.CustomCheckboxWidget; import java.util.ArrayList; import java.util.List; @@ -17,8 +17,8 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public abstract class AbstractSecurityCardScreen extends AbstractStretchingScreen { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/BuiltinPermission.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/BuiltinPermission.java similarity index 77% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/BuiltinPermission.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/BuiltinPermission.java index 27fa26f1d..f661fe064 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/BuiltinPermission.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/BuiltinPermission.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; -import com.refinedmods.refinedstorage.platform.api.security.BuiltinPermissions; -import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.api.security.BuiltinPermissions; +import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.common.content.ContentNames; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public enum BuiltinPermission implements PlatformPermission { /** diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/FallbackSecurityCardContainerMenu.java similarity index 77% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/FallbackSecurityCardContainerMenu.java index 436114180..a7756c8a9 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/FallbackSecurityCardContainerMenu.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.content.Menus; import net.minecraft.world.entity.player.Inventory; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardExtendedMenuProvider.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/FallbackSecurityCardExtendedMenuProvider.java similarity index 83% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardExtendedMenuProvider.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/FallbackSecurityCardExtendedMenuProvider.java index bd8270107..6559f4408 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardExtendedMenuProvider.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/FallbackSecurityCardExtendedMenuProvider.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.content.ContentNames; import java.util.Set; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/FallbackSecurityCardItem.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/FallbackSecurityCardItem.java index dcb4dcb8a..05d452800 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/FallbackSecurityCardItem.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; import com.refinedmods.refinedstorage.api.network.security.SecurityActor; import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; import java.util.Optional; import java.util.Set; @@ -16,7 +16,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class FallbackSecurityCardItem extends AbstractSecurityCardItem { private static final Component HELP = createTranslation("item", "fallback_security_card.help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/FallbackSecurityCardScreen.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/FallbackSecurityCardScreen.java index 5453190a2..45cd51f2b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/FallbackSecurityCardScreen.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/PlatformSecurityNetworkComponentImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/PlatformSecurityNetworkComponentImpl.java similarity index 87% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/PlatformSecurityNetworkComponentImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/PlatformSecurityNetworkComponentImpl.java index 9eb55463d..ef962bb51 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/PlatformSecurityNetworkComponentImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/PlatformSecurityNetworkComponentImpl.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; import com.refinedmods.refinedstorage.api.network.impl.security.SecurityNetworkComponentImpl; import com.refinedmods.refinedstorage.api.network.security.Permission; import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage.platform.api.security.PlatformSecurityNetworkComponent; +import com.refinedmods.refinedstorage.common.api.security.PlatformSecurityNetworkComponent; import com.mojang.authlib.GameProfile; import net.minecraft.server.MinecraftServer; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/PlayerBoundSecurityCardData.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/PlayerBoundSecurityCardData.java similarity index 96% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/PlayerBoundSecurityCardData.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/PlayerBoundSecurityCardData.java index e01a774fb..1f6dd235a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/PlayerBoundSecurityCardData.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/PlayerBoundSecurityCardData.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/PlayerSecurityActor.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/PlayerSecurityActor.java similarity index 73% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/PlayerSecurityActor.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/PlayerSecurityActor.java index 57ec3b289..8e2086b70 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/PlayerSecurityActor.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/PlayerSecurityActor.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; import com.refinedmods.refinedstorage.api.network.security.SecurityActor; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardBoundPlayer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardBoundPlayer.java similarity index 95% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardBoundPlayer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardBoundPlayer.java index 448731dd0..439ce4ae2 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardBoundPlayer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardBoundPlayer.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; import java.util.UUID; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardContainerMenu.java similarity index 85% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardContainerMenu.java index a16f66548..67122220e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardContainerMenu.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; -import com.refinedmods.refinedstorage.platform.common.support.stretching.ScreenSizeListener; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.support.packet.c2s.C2SPackets; +import com.refinedmods.refinedstorage.common.support.stretching.ScreenSizeListener; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardData.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardData.java similarity index 72% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardData.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardData.java index 2f1358792..f7d81f912 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardData.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardData.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceFactory; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceFactory; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardExtendedMenuProvider.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardExtendedMenuProvider.java similarity index 87% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardExtendedMenuProvider.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardExtendedMenuProvider.java index 04800ccca..20c98b8a3 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardExtendedMenuProvider.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardExtendedMenuProvider.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.content.ContentNames; import java.util.Set; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardItem.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardItem.java index b0de34657..2feabe88b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardItem.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; import com.refinedmods.refinedstorage.api.network.security.SecurityActor; import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.DataComponents; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.content.DataComponents; import java.util.List; import java.util.Optional; @@ -25,7 +25,7 @@ import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; import static java.util.Objects.requireNonNull; public class SecurityCardItem extends AbstractSecurityCardItem { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardItemPropertyFunction.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardItemPropertyFunction.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardItemPropertyFunction.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardItemPropertyFunction.java index 27ed5fe87..3ae9aa49b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardItemPropertyFunction.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardItemPropertyFunction.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; import javax.annotation.Nullable; @@ -8,7 +8,7 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public class SecurityCardItemPropertyFunction implements ClampedItemPropertyFunction { public static final ResourceLocation NAME = createIdentifier("security_card_active"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardPermissions.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardPermissions.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardPermissions.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardPermissions.java index 8285fc94f..b025dccab 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardPermissions.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardPermissions.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; import java.util.Collections; import java.util.HashMap; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardScreen.java similarity index 96% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardScreen.java index 67ddaf511..6cbb6fef1 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardScreen.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; import net.minecraft.client.gui.components.Button; import net.minecraft.network.chat.Component; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityManagerBlock.java similarity index 63% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityManagerBlock.java index 4b1a0a421..ab5646f33 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityManagerBlock.java @@ -1,18 +1,18 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.support.AbstractActiveColoredDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; -import com.refinedmods.refinedstorage.platform.common.support.direction.HorizontalDirection; -import com.refinedmods.refinedstorage.platform.common.support.direction.HorizontalDirectionType; -import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.BlockConstants; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.support.AbstractActiveColoredDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.common.support.direction.DirectionType; +import com.refinedmods.refinedstorage.common.support.direction.HorizontalDirection; +import com.refinedmods.refinedstorage.common.support.direction.HorizontalDirectionType; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker; import javax.annotation.Nullable; @@ -26,7 +26,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class SecurityManagerBlock extends AbstractActiveColoredDirectionalBlock diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityManagerBlockEntity.java similarity index 87% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityManagerBlockEntity.java index d12f96dd3..346090ea4 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityManagerBlockEntity.java @@ -1,18 +1,18 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; import com.refinedmods.refinedstorage.api.network.impl.node.security.SecurityDecisionProviderProxyNetworkNode; import com.refinedmods.refinedstorage.api.network.impl.security.SecurityDecisionProviderImpl; -import com.refinedmods.refinedstorage.platform.api.security.SecurityHelper; -import com.refinedmods.refinedstorage.platform.api.security.SecurityPolicyContainerItem; -import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionSink; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.support.BlockEntityWithDrops; -import com.refinedmods.refinedstorage.platform.common.support.FilteredContainer; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeMenuProvider; -import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.util.ContainerUtil; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.security.SecurityHelper; +import com.refinedmods.refinedstorage.common.api.security.SecurityPolicyContainerItem; +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.support.BlockEntityWithDrops; +import com.refinedmods.refinedstorage.common.support.FilteredContainer; +import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeMenuProvider; +import com.refinedmods.refinedstorage.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.util.ContainerUtil; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityManagerContainerMenu.java similarity index 69% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityManagerContainerMenu.java index dafc1f52a..cd194ec04 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityManagerContainerMenu.java @@ -1,21 +1,19 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.FilteredContainer; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ValidatedSlot; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage.common.support.FilteredContainer; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.ValidatedSlot; import javax.annotation.Nullable; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.Slot; -import static com.refinedmods.refinedstorage.platform.common.security.SecurityManagerBlockEntity.CARD_AMOUNT; - public class SecurityManagerContainerMenu extends AbstractBaseContainerMenu { @Nullable private Slot fallbackSecurityCardSlot; @@ -24,7 +22,8 @@ public SecurityManagerContainerMenu(final int syncId, final Inventory playerInve super(Menus.INSTANCE.getSecurityManager(), syncId); addSlots( playerInventory, - new FilteredContainer(CARD_AMOUNT, SecurityManagerBlockEntity::isValidSecurityCard), + new FilteredContainer(SecurityManagerBlockEntity.CARD_AMOUNT, + SecurityManagerBlockEntity::isValidSecurityCard), new FilteredContainer(1, SecurityManagerBlockEntity::isValidFallbackSecurityCard) ); registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); @@ -45,7 +44,7 @@ public SecurityManagerContainerMenu(final int syncId, final Inventory playerInve private void addSlots(final Inventory playerInventory, final FilteredContainer securityCards, final FilteredContainer fallbackSecurityCard) { - for (int i = 0; i < CARD_AMOUNT; ++i) { + for (int i = 0; i < SecurityManagerBlockEntity.CARD_AMOUNT; ++i) { final int column = i % 9; final int x = 8 + (column * 18); final int row = i / 9; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityManagerScreen.java similarity index 73% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityManagerScreen.java index 5d2aba12b..e51363359 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityManagerScreen.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.security; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.HelpClientTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.support.widget.RedstoneModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.tooltip.HelpClientTooltipComponent; +import com.refinedmods.refinedstorage.common.support.widget.RedstoneModeSideButtonWidget; import java.util.List; @@ -14,8 +14,8 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class SecurityManagerScreen extends AbstractBaseScreen { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/security_manager.png"); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/package-info.java new file mode 100644 index 000000000..986655370 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.security; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractDiskContainerBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AbstractDiskContainerBlockEntity.java similarity index 89% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractDiskContainerBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AbstractDiskContainerBlockEntity.java index 317562c9d..980de5237 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractDiskContainerBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AbstractDiskContainerBlockEntity.java @@ -1,17 +1,17 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import com.refinedmods.refinedstorage.api.network.impl.node.AbstractStorageContainerNetworkNode; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.BlockEntityWithDrops; -import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage.platform.common.support.FilteredContainer; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; -import com.refinedmods.refinedstorage.platform.common.util.ContainerUtil; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.BlockEntityWithDrops; +import com.refinedmods.refinedstorage.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.common.support.FilteredContainer; +import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.common.util.ContainerUtil; import java.util.Set; import java.util.function.UnaryOperator; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractProgressStorageScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AbstractProgressStorageScreen.java similarity index 92% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractProgressStorageScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AbstractProgressStorageScreen.java index 27305545f..ab13cec1c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractProgressStorageScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AbstractProgressStorageScreen.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; -import com.refinedmods.refinedstorage.platform.common.support.widget.ProgressWidget; +import com.refinedmods.refinedstorage.common.support.widget.ProgressWidget; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractStorageContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AbstractStorageContainerMenu.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractStorageContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AbstractStorageContainerMenu.java index 9403de774..e1a01a0b8 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractStorageContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AbstractStorageContainerMenu.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; import com.refinedmods.refinedstorage.api.storage.AccessMode; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.containermenu.ServerProperty; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.MenuType; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractStorageScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AbstractStorageScreen.java similarity index 81% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractStorageScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AbstractStorageScreen.java index 4e47d7910..3ea7a7ea6 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractStorageScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AbstractStorageScreen.java @@ -1,17 +1,17 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; -import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.widget.FuzzyModeSideButtonWidget; -import com.refinedmods.refinedstorage.platform.common.support.widget.RedstoneModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.api.support.AmountFormatting; +import com.refinedmods.refinedstorage.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.widget.FuzzyModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.widget.RedstoneModeSideButtonWidget; import javax.annotation.Nullable; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public abstract class AbstractStorageScreen extends AbstractBaseScreen { private static final Component ALLOW_FILTER_MODE_HELP = createTranslation("gui", "storage.filter_mode.allow.help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AccessModeSettings.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AccessModeSettings.java similarity index 92% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AccessModeSettings.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AccessModeSettings.java index f38b13d84..6e481c012 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AccessModeSettings.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AccessModeSettings.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import com.refinedmods.refinedstorage.api.storage.AccessMode; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AccessModeSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AccessModeSideButtonWidget.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AccessModeSideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AccessModeSideButtonWidget.java index 450550cfd..3692dde22 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AccessModeSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AccessModeSideButtonWidget.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import com.refinedmods.refinedstorage.api.storage.AccessMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.widget.AbstractSideButtonWidget; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class AccessModeSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "access_mode"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/BucketPlayerInventoryInsertableStorage.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/BucketPlayerInventoryInsertableStorage.java similarity index 92% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/BucketPlayerInventoryInsertableStorage.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/BucketPlayerInventoryInsertableStorage.java index d956c7d30..48fab8ce3 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/BucketPlayerInventoryInsertableStorage.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/BucketPlayerInventoryInsertableStorage.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; import com.refinedmods.refinedstorage.api.storage.Storage; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.item.ItemStack; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/ClientStorageRepository.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/ClientStorageRepository.java similarity index 87% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/ClientStorageRepository.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/ClientStorageRepository.java index 9bf3eba78..5eaf0826d 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/ClientStorageRepository.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/ClientStorageRepository.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import com.refinedmods.refinedstorage.api.core.CoreValidations; -import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; -import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.common.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.common.api.storage.StorageInfo; +import com.refinedmods.refinedstorage.common.api.storage.StorageRepository; import java.util.HashMap; import java.util.Map; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/Disk.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/Disk.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/Disk.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/Disk.java index e42f6cab7..7ed682445 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/Disk.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/Disk.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import com.refinedmods.refinedstorage.api.storage.StorageState; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/DiskContainerBlockEntityTicker.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/DiskContainerBlockEntityTicker.java similarity index 89% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/DiskContainerBlockEntityTicker.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/DiskContainerBlockEntityTicker.java index afb35e97b..3bf70a0b6 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/DiskContainerBlockEntityTicker.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/DiskContainerBlockEntityTicker.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import com.refinedmods.refinedstorage.api.network.impl.node.AbstractStorageContainerNetworkNode; -import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/DiskInventory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/DiskInventory.java similarity index 92% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/DiskInventory.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/DiskInventory.java index 991515b3f..fd32dd4ca 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/DiskInventory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/DiskInventory.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import com.refinedmods.refinedstorage.api.network.impl.node.AbstractStorageContainerNetworkNode; import com.refinedmods.refinedstorage.api.storage.Storage; import com.refinedmods.refinedstorage.api.storage.StorageState; -import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItem; -import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage.platform.common.support.FilteredContainer; +import com.refinedmods.refinedstorage.common.api.storage.StorageContainerItem; +import com.refinedmods.refinedstorage.common.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.common.support.FilteredContainer; import java.util.Optional; import java.util.function.IntFunction; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/DiskStateChangeListener.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/DiskStateChangeListener.java similarity index 95% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/DiskStateChangeListener.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/DiskStateChangeListener.java index 3e2cc9dc7..2661a9c43 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/DiskStateChangeListener.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/DiskStateChangeListener.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import com.refinedmods.refinedstorage.api.storage.StateTrackedStorage; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/FilterModeSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/FilterModeSideButtonWidget.java similarity index 86% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/FilterModeSideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/FilterModeSideButtonWidget.java index b85acaf6e..c67ebc4ae 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/FilterModeSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/FilterModeSideButtonWidget.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.widget.AbstractSideButtonWidget; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class FilterModeSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "filter_mode"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/FluidStorageVariant.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/FluidStorageVariant.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/FluidStorageVariant.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/FluidStorageVariant.java index c841e2f51..91b7698b0 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/FluidStorageVariant.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/FluidStorageVariant.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; -import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.common.Platform; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/ItemStorageVariant.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/ItemStorageVariant.java similarity index 91% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/ItemStorageVariant.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/ItemStorageVariant.java index 17c691d2b..ae0d5a8b1 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/ItemStorageVariant.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/ItemStorageVariant.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/LimitedPlatformStorage.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/LimitedPlatformStorage.java similarity index 85% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/LimitedPlatformStorage.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/LimitedPlatformStorage.java index f2c6e92b1..f5f3ce565 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/LimitedPlatformStorage.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/LimitedPlatformStorage.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorage; import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageRepository; -import com.refinedmods.refinedstorage.platform.api.storage.StorageType; +import com.refinedmods.refinedstorage.common.api.storage.StorageType; class LimitedPlatformStorage extends PlatformStorage implements LimitedStorage { private final LimitedStorageImpl limitedStorage; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/PlatformStorage.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/PlatformStorage.java similarity index 91% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/PlatformStorage.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/PlatformStorage.java index 380b88bdd..c2d86433f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/PlatformStorage.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/PlatformStorage.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.resource.ResourceKey; @@ -9,9 +9,9 @@ import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorage; import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageRepository; -import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage.platform.api.storage.StorageType; +import com.refinedmods.refinedstorage.common.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.common.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.common.api.storage.StorageType; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/PrioritySideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/PrioritySideButtonWidget.java similarity index 79% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/PrioritySideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/PrioritySideButtonWidget.java index a6d6ad780..b8be92e20 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/PrioritySideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/PrioritySideButtonWidget.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; -import com.refinedmods.refinedstorage.platform.common.support.amount.PriorityScreen; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.amount.PriorityScreen; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.widget.AbstractSideButtonWidget; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; @@ -10,7 +10,7 @@ import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class PrioritySideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "priority"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/SameTypeStorageType.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/SameTypeStorageType.java similarity index 93% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/SameTypeStorageType.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/SameTypeStorageType.java index 60d3d0c75..f571efe2a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/SameTypeStorageType.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/SameTypeStorageType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; @@ -6,8 +6,8 @@ import com.refinedmods.refinedstorage.api.storage.tracked.InMemoryTrackedStorageRepository; import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageImpl; import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageRepository; -import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage.platform.api.storage.StorageType; +import com.refinedmods.refinedstorage.common.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.common.api.storage.StorageType; import java.util.function.Function; import java.util.function.Predicate; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageAccessor.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageAccessor.java similarity index 68% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageAccessor.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageAccessor.java index e75df6a63..4e13b411e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageAccessor.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageAccessor.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; public interface StorageAccessor { long getStored(); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageCodecs.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageCodecs.java similarity index 97% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageCodecs.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageCodecs.java index 20c9ae196..9ec837f8f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageCodecs.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageCodecs.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; @@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorage; import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorage; -import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.common.api.storage.PlayerActor; import java.util.List; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageConfigurationContainer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageConfigurationContainer.java similarity index 82% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageConfigurationContainer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageConfigurationContainer.java index 7abf7a563..1ddf6fa8f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageConfigurationContainer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageConfigurationContainer.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; import com.refinedmods.refinedstorage.api.storage.AccessMode; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; public interface StorageConfigurationContainer { int getPriority(); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageConfigurationContainerImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageConfigurationContainerImpl.java similarity index 92% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageConfigurationContainerImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageConfigurationContainerImpl.java index 6f3788250..e544a6ba0 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageConfigurationContainerImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageConfigurationContainerImpl.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import com.refinedmods.refinedstorage.api.network.impl.storage.StorageConfiguration; import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; import com.refinedmods.refinedstorage.api.storage.AccessMode; -import com.refinedmods.refinedstorage.platform.common.support.FilterModeSettings; -import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.FilterModeSettings; +import com.refinedmods.refinedstorage.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; import java.util.function.Consumer; import java.util.function.Supplier; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageContainerItemHelperImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageContainerItemHelperImpl.java similarity index 92% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageContainerItemHelperImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageContainerItemHelperImpl.java index a073710b0..c5bf85c0a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageContainerItemHelperImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageContainerItemHelperImpl.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.storage; - -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage.platform.api.storage.StorageBlockEntity; -import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItemHelper; -import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; -import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage.platform.common.content.DataComponents; +package com.refinedmods.refinedstorage.common.storage; + +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.common.api.storage.StorageBlockEntity; +import com.refinedmods.refinedstorage.common.api.storage.StorageContainerItemHelper; +import com.refinedmods.refinedstorage.common.api.storage.StorageInfo; +import com.refinedmods.refinedstorage.common.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.common.content.DataComponents; import java.util.Collections; import java.util.HashMap; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StoragePropertyTypes.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StoragePropertyTypes.java similarity index 65% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StoragePropertyTypes.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StoragePropertyTypes.java index 2b1bec840..a388d1c6e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StoragePropertyTypes.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StoragePropertyTypes.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import com.refinedmods.refinedstorage.api.storage.AccessMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyType; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyType; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public final class StoragePropertyTypes { public static final PropertyType PRIORITY = PropertyTypes.createIntegerProperty( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageRepositoryImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageRepositoryImpl.java similarity index 86% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageRepositoryImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageRepositoryImpl.java index 559a59a73..5a1d50769 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageRepositoryImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageRepositoryImpl.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import com.refinedmods.refinedstorage.api.core.CoreValidations; -import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; -import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage.platform.common.support.AbstractPlatformSavedData; +import com.refinedmods.refinedstorage.common.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.common.api.storage.StorageInfo; +import com.refinedmods.refinedstorage.common.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.common.support.AbstractPlatformSavedData; import java.util.HashMap; import java.util.Map; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageTooltipHelper.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageTooltipHelper.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageTooltipHelper.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageTooltipHelper.java index 7b7041aef..32b0277f7 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageTooltipHelper.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageTooltipHelper.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; import java.util.List; import java.util.function.LongFunction; @@ -6,7 +6,7 @@ import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; final class StorageTooltipHelper { private StorageTooltipHelper() { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageTypes.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageTypes.java similarity index 55% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageTypes.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageTypes.java index ee6feb7da..e3f0deb8c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageTypes.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageTypes.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; -import com.refinedmods.refinedstorage.platform.api.storage.StorageType; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.storage.StorageType; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.resource.ResourceCodecs; public final class StorageTypes { public static final StorageType ITEM = new SameTypeStorageType<>( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/VoidExcessSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/VoidExcessSideButtonWidget.java similarity index 74% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/VoidExcessSideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/VoidExcessSideButtonWidget.java index cd2583f75..20a3174b6 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/VoidExcessSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/VoidExcessSideButtonWidget.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractYesNoSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.widget.AbstractYesNoSideButtonWidget; import javax.annotation.Nullable; import net.minecraft.network.chat.Component; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class VoidExcessSideButtonWidget extends AbstractYesNoSideButtonWidget { private static final Component HELP = createTranslation("gui", "void_excess.help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java index 9a8f940e2..66bfa0378 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.storage.diskdrive; +package com.refinedmods.refinedstorage.common.storage.diskdrive; import com.refinedmods.refinedstorage.api.network.impl.node.storage.StorageNetworkNode; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.storage.AbstractDiskContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.StorageConfigurationContainerImpl; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.storage.AbstractDiskContainerBlockEntity; +import com.refinedmods.refinedstorage.common.storage.StorageConfigurationContainerImpl; import java.util.Set; import java.util.function.UnaryOperator; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntityRenderer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/AbstractDiskDriveBlockEntityRenderer.java similarity index 86% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntityRenderer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/AbstractDiskDriveBlockEntityRenderer.java index edf5fdb2c..2b4c58cc0 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntityRenderer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/AbstractDiskDriveBlockEntityRenderer.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.storage.diskdrive; +package com.refinedmods.refinedstorage.common.storage.diskdrive; -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage.platform.common.support.render.AbstractDiskLedBlockEntityRenderer; +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.common.support.render.AbstractDiskLedBlockEntityRenderer; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/DiskDriveBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/DiskDriveBlock.java similarity index 70% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/DiskDriveBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/DiskDriveBlock.java index 860a2be16..cbf567f88 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/DiskDriveBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/DiskDriveBlock.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.storage.diskdrive; +package com.refinedmods.refinedstorage.common.storage.diskdrive; import com.refinedmods.refinedstorage.api.network.impl.node.storage.StorageNetworkNode; -import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.storage.DiskContainerBlockEntityTicker; -import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirectionType; -import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; +import com.refinedmods.refinedstorage.common.content.BlockConstants; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.storage.DiskContainerBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.common.support.direction.BiDirectionType; +import com.refinedmods.refinedstorage.common.support.direction.DirectionType; import java.util.function.BiFunction; @@ -22,7 +22,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class DiskDriveBlock extends AbstractDirectionalBlock implements EntityBlock { private static final Component HELP = createTranslation("item", "disk_drive.help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/DiskDriveContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/DiskDriveContainerMenu.java similarity index 75% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/DiskDriveContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/DiskDriveContainerMenu.java index f8c7d47e2..bcce73acb 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/DiskDriveContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/DiskDriveContainerMenu.java @@ -1,19 +1,19 @@ -package com.refinedmods.refinedstorage.platform.common.storage.diskdrive; - -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItem; -import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.storage.AbstractStorageContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storage.StorageAccessor; -import com.refinedmods.refinedstorage.platform.common.storage.StorageConfigurationContainer; -import com.refinedmods.refinedstorage.platform.common.support.FilteredContainer; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlot; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlotType; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ValidatedSlot; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; +package com.refinedmods.refinedstorage.common.storage.diskdrive; + +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.storage.StorageContainerItem; +import com.refinedmods.refinedstorage.common.api.storage.StorageInfo; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.storage.AbstractStorageContainerMenu; +import com.refinedmods.refinedstorage.common.storage.StorageAccessor; +import com.refinedmods.refinedstorage.common.storage.StorageConfigurationContainer; +import com.refinedmods.refinedstorage.common.support.FilteredContainer; +import com.refinedmods.refinedstorage.common.support.containermenu.ResourceSlot; +import com.refinedmods.refinedstorage.common.support.containermenu.ResourceSlotType; +import com.refinedmods.refinedstorage.common.support.containermenu.ValidatedSlot; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; import java.util.ArrayList; import java.util.List; @@ -25,7 +25,7 @@ import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class DiskDriveContainerMenu extends AbstractStorageContainerMenu implements StorageAccessor { private static final int DISK_SLOT_X = 61; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/DiskDriveScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/DiskDriveScreen.java similarity index 74% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/DiskDriveScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/DiskDriveScreen.java index 745da1481..465414a1c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/DiskDriveScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/DiskDriveScreen.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.storage.diskdrive; +package com.refinedmods.refinedstorage.common.storage.diskdrive; -import com.refinedmods.refinedstorage.platform.common.storage.AbstractProgressStorageScreen; +import com.refinedmods.refinedstorage.common.storage.AbstractProgressStorageScreen; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; @@ -8,8 +8,8 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class DiskDriveScreen extends AbstractProgressStorageScreen { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/disk_drive.png"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/EmptyStorageDiskInfoAccessor.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/EmptyStorageDiskInfoAccessor.java similarity index 64% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/EmptyStorageDiskInfoAccessor.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/EmptyStorageDiskInfoAccessor.java index b8ccde194..a51fb0736 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/EmptyStorageDiskInfoAccessor.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/EmptyStorageDiskInfoAccessor.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.storage.diskdrive; +package com.refinedmods.refinedstorage.common.storage.diskdrive; -import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; +import com.refinedmods.refinedstorage.common.api.storage.StorageInfo; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/StorageDiskInfoAccessor.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/StorageDiskInfoAccessor.java similarity index 52% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/StorageDiskInfoAccessor.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/StorageDiskInfoAccessor.java index bcfb91fa7..84c350adf 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/StorageDiskInfoAccessor.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/StorageDiskInfoAccessor.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.storage.diskdrive; +package com.refinedmods.refinedstorage.common.storage.diskdrive; -import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; +import com.refinedmods.refinedstorage.common.api.storage.StorageInfo; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/StorageDiskInfoAccessorImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/StorageDiskInfoAccessorImpl.java similarity index 67% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/StorageDiskInfoAccessorImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/StorageDiskInfoAccessorImpl.java index 72c37a22a..de6d576ab 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/StorageDiskInfoAccessorImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/StorageDiskInfoAccessorImpl.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.storage.diskdrive; +package com.refinedmods.refinedstorage.common.storage.diskdrive; -import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItem; -import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; -import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.common.api.storage.StorageContainerItem; +import com.refinedmods.refinedstorage.common.api.storage.StorageInfo; +import com.refinedmods.refinedstorage.common.api.storage.StorageRepository; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/package-info.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/package-info.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/package-info.java index 97bc9c7e3..9d9f45875 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/package-info.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.importer; +package com.refinedmods.refinedstorage.common.storage.diskdrive; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java index 86002c063..8fa8b76dc 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java @@ -1,21 +1,21 @@ -package com.refinedmods.refinedstorage.platform.common.storage.diskinterface; +package com.refinedmods.refinedstorage.common.storage.diskinterface; import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferListener; import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferMode; import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferNetworkNode; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.storage.AbstractDiskContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.support.FilterModeSettings; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; -import com.refinedmods.refinedstorage.platform.common.util.ContainerUtil; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.common.storage.AbstractDiskContainerBlockEntity; +import com.refinedmods.refinedstorage.common.support.FilterModeSettings; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.common.util.ContainerUtil; import java.util.List; import java.util.Set; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntityRenderer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/AbstractDiskInterfaceBlockEntityRenderer.java similarity index 86% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntityRenderer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/AbstractDiskInterfaceBlockEntityRenderer.java index 2c6a45601..83f7c22e1 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntityRenderer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/AbstractDiskInterfaceBlockEntityRenderer.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.storage.diskinterface; +package com.refinedmods.refinedstorage.common.storage.diskinterface; -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage.platform.common.support.render.AbstractDiskLedBlockEntityRenderer; +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.common.support.render.AbstractDiskLedBlockEntityRenderer; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/DiskInterfaceBlock.java similarity index 69% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/DiskInterfaceBlock.java index 516bd4498..83f1f66eb 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/DiskInterfaceBlock.java @@ -1,18 +1,18 @@ -package com.refinedmods.refinedstorage.platform.common.storage.diskinterface; +package com.refinedmods.refinedstorage.common.storage.diskinterface; import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferNetworkNode; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.storage.DiskContainerBlockEntityTicker; -import com.refinedmods.refinedstorage.platform.common.support.AbstractActiveColoredDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirectionType; -import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.BlockConstants; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.storage.DiskContainerBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.AbstractActiveColoredDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.common.support.direction.BiDirectionType; +import com.refinedmods.refinedstorage.common.support.direction.DirectionType; import java.util.function.BiFunction; import javax.annotation.Nullable; @@ -28,7 +28,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class DiskInterfaceBlock extends AbstractActiveColoredDirectionalBlock diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/DiskInterfaceContainerMenu.java similarity index 72% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/DiskInterfaceContainerMenu.java index 3d72909cb..8958fd785 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/DiskInterfaceContainerMenu.java @@ -1,32 +1,32 @@ -package com.refinedmods.refinedstorage.platform.common.storage.diskinterface; +package com.refinedmods.refinedstorage.common.storage.diskinterface; import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferMode; import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItem; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.storage.DiskInventory; -import com.refinedmods.refinedstorage.platform.common.support.FilteredContainer; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlot; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlotType; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ValidatedSlot; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeSlot; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.storage.StorageContainerItem; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.storage.DiskInventory; +import com.refinedmods.refinedstorage.common.support.FilteredContainer; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.containermenu.ResourceSlot; +import com.refinedmods.refinedstorage.common.support.containermenu.ResourceSlotType; +import com.refinedmods.refinedstorage.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.ValidatedSlot; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeSlot; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.Slot; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class DiskInterfaceContainerMenu extends AbstractResourceContainerMenu { private static final int DISK_SLOT_X1 = 44; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfacePropertyTypes.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/DiskInterfacePropertyTypes.java similarity index 61% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfacePropertyTypes.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/DiskInterfacePropertyTypes.java index 05e1eed81..5bf477228 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfacePropertyTypes.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/DiskInterfacePropertyTypes.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.storage.diskinterface; +package com.refinedmods.refinedstorage.common.storage.diskinterface; import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyType; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyType; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; class DiskInterfacePropertyTypes { public static final PropertyType TRANSFER_MODE = new PropertyType<>( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/DiskInterfaceScreen.java similarity index 77% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/DiskInterfaceScreen.java index 4ee3aa644..db31dce5b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/DiskInterfaceScreen.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.storage.diskinterface; +package com.refinedmods.refinedstorage.common.storage.diskinterface; import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferMode; -import com.refinedmods.refinedstorage.platform.common.storage.FilterModeSideButtonWidget; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.widget.FuzzyModeSideButtonWidget; -import com.refinedmods.refinedstorage.platform.common.support.widget.RedstoneModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.storage.FilterModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.widget.FuzzyModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.widget.RedstoneModeSideButtonWidget; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; @@ -13,8 +13,8 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class DiskInterfaceScreen extends AbstractBaseScreen { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/disk_interface.png"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/TransferModeSettings.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/TransferModeSettings.java similarity index 91% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/TransferModeSettings.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/TransferModeSettings.java index da39340a3..50630c045 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/TransferModeSettings.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/TransferModeSettings.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.storage.diskinterface; +package com.refinedmods.refinedstorage.common.storage.diskinterface; import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferMode; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/TransferModeSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/TransferModeSideButtonWidget.java similarity index 87% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/TransferModeSideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/TransferModeSideButtonWidget.java index 35193b01a..f497c1db6 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/TransferModeSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/TransferModeSideButtonWidget.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.storage.diskinterface; +package com.refinedmods.refinedstorage.common.storage.diskinterface; import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.widget.AbstractSideButtonWidget; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; class TransferModeSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "disk_interface.transfer_mode"); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/package-info.java new file mode 100644 index 000000000..76f3eff74 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.storage.diskinterface; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageBlock.java similarity index 78% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageBlock.java index 7244916c6..73c7a47aa 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageBlock.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.common.storage.externalstorage; +package com.refinedmods.refinedstorage.common.storage.externalstorage; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalCableBlock; -import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage.platform.common.support.ColorableBlock; -import com.refinedmods.refinedstorage.platform.common.support.DirectionalCableBlockShapes; -import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.AbstractDirectionalCableBlock; +import com.refinedmods.refinedstorage.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.common.support.ColorableBlock; +import com.refinedmods.refinedstorage.common.support.DirectionalCableBlockShapes; +import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker; import java.util.HashMap; import java.util.Map; @@ -33,7 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class ExternalStorageBlock extends AbstractDirectionalCableBlock implements ColorableBlock, EntityBlock, BlockItemProvider { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageBlockEntity.java similarity index 85% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageBlockEntity.java index 5c2c6c4f5..6229a5af0 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageBlockEntity.java @@ -1,17 +1,17 @@ -package com.refinedmods.refinedstorage.platform.common.storage.externalstorage; +package com.refinedmods.refinedstorage.common.storage.externalstorage; import com.refinedmods.refinedstorage.api.network.impl.node.externalstorage.ExternalStorageNetworkNode; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.storage.StorageConfigurationContainerImpl; -import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.storage.StorageConfigurationContainerImpl; +import com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageContainerMenu.java similarity index 67% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageContainerMenu.java index 785db57fa..ca4f9b5e8 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageContainerMenu.java @@ -1,19 +1,19 @@ -package com.refinedmods.refinedstorage.platform.common.storage.externalstorage; +package com.refinedmods.refinedstorage.common.storage.externalstorage; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.storage.AbstractStorageContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storage.StorageConfigurationContainer; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlot; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlotType; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.storage.AbstractStorageContainerMenu; +import com.refinedmods.refinedstorage.common.storage.StorageConfigurationContainer; +import com.refinedmods.refinedstorage.common.support.containermenu.ResourceSlot; +import com.refinedmods.refinedstorage.common.support.containermenu.ResourceSlotType; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.Slot; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class ExternalStorageContainerMenu extends AbstractStorageContainerMenu { private static final int FILTER_SLOT_X = 8; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageScreen.java similarity index 73% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageScreen.java index cc24c5c12..abb6475ac 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageScreen.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.storage.externalstorage; +package com.refinedmods.refinedstorage.common.storage.externalstorage; -import com.refinedmods.refinedstorage.platform.common.storage.AbstractStorageScreen; -import com.refinedmods.refinedstorage.platform.common.support.AbstractFilterScreen; +import com.refinedmods.refinedstorage.common.storage.AbstractStorageScreen; +import com.refinedmods.refinedstorage.common.support.AbstractFilterScreen; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageTrackedStorageRepository.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageTrackedStorageRepository.java similarity index 89% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageTrackedStorageRepository.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageTrackedStorageRepository.java index dfd5d593c..96df4231b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageTrackedStorageRepository.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageTrackedStorageRepository.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.storage.externalstorage; +package com.refinedmods.refinedstorage.common.storage.externalstorage; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.tracked.InMemoryTrackedStorageRepository; -import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; +import com.refinedmods.refinedstorage.common.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.support.resource.ResourceCodecs; import java.util.Collections; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageWorkRate.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageWorkRate.java similarity index 91% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageWorkRate.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageWorkRate.java index d57bb780f..99f46938e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageWorkRate.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageWorkRate.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.storage.externalstorage; +package com.refinedmods.refinedstorage.common.storage.externalstorage; import com.google.common.util.concurrent.RateLimiter; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/package-info.java new file mode 100644 index 000000000..3c7f8a2d8 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.storage.externalstorage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/package-info.java new file mode 100644 index 000000000..8bfa9e24d --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.storage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/AbstractPortableGridBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/AbstractPortableGridBlockEntity.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/AbstractPortableGridBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/AbstractPortableGridBlockEntity.java index 0ce0e8c66..02c937fd2 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/AbstractPortableGridBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/AbstractPortableGridBlockEntity.java @@ -1,27 +1,27 @@ -package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.common.storage.portablegrid; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage.api.network.impl.energy.EnergyStorageImpl; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.configurationcard.ConfigurationCardTarget; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.support.energy.TransferableBlockEntityEnergy; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.grid.GridData; -import com.refinedmods.refinedstorage.platform.common.grid.PortableGridData; -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.common.storage.DiskInventory; -import com.refinedmods.refinedstorage.platform.common.storage.DiskStateChangeListener; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneModeSettings; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ExtendedMenuProvider; -import com.refinedmods.refinedstorage.platform.common.support.energy.BlockEntityEnergyStorage; -import com.refinedmods.refinedstorage.platform.common.support.energy.CreativeEnergyStorage; -import com.refinedmods.refinedstorage.platform.common.support.energy.ItemBlockEnergyStorage; -import com.refinedmods.refinedstorage.platform.common.util.ContainerUtil; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.configurationcard.ConfigurationCardTarget; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.support.energy.TransferableBlockEntityEnergy; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.common.grid.GridData; +import com.refinedmods.refinedstorage.common.grid.PortableGridData; +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.common.storage.DiskInventory; +import com.refinedmods.refinedstorage.common.storage.DiskStateChangeListener; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.RedstoneModeSettings; +import com.refinedmods.refinedstorage.common.support.containermenu.ExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.support.energy.BlockEntityEnergyStorage; +import com.refinedmods.refinedstorage.common.support.energy.CreativeEnergyStorage; +import com.refinedmods.refinedstorage.common.support.energy.ItemBlockEnergyStorage; +import com.refinedmods.refinedstorage.common.util.ContainerUtil; import java.util.Optional; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/AbstractPortableGridBlockEntityRenderer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/AbstractPortableGridBlockEntityRenderer.java similarity index 87% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/AbstractPortableGridBlockEntityRenderer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/AbstractPortableGridBlockEntityRenderer.java index 2b0a87407..066100e74 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/AbstractPortableGridBlockEntityRenderer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/AbstractPortableGridBlockEntityRenderer.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.common.storage.portablegrid; -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage.platform.common.support.render.AbstractDiskLedBlockEntityRenderer; +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.common.support.render.AbstractDiskLedBlockEntityRenderer; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/AbstractPortableGridContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/AbstractPortableGridContainerMenu.java similarity index 74% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/AbstractPortableGridContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/AbstractPortableGridContainerMenu.java index f1d8c93b8..328e62c64 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/AbstractPortableGridContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/AbstractPortableGridContainerMenu.java @@ -1,15 +1,15 @@ -package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.common.storage.portablegrid; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItem; -import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.grid.PortableGridData; -import com.refinedmods.refinedstorage.platform.common.storage.DiskInventory; -import com.refinedmods.refinedstorage.platform.common.support.FilteredContainer; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ValidatedSlot; -import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyInfo; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.storage.StorageContainerItem; +import com.refinedmods.refinedstorage.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.common.grid.PortableGridData; +import com.refinedmods.refinedstorage.common.storage.DiskInventory; +import com.refinedmods.refinedstorage.common.support.FilteredContainer; +import com.refinedmods.refinedstorage.common.support.containermenu.ValidatedSlot; +import com.refinedmods.refinedstorage.common.support.energy.EnergyContainerMenu; +import com.refinedmods.refinedstorage.common.support.energy.EnergyInfo; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/InWorldPortableGrid.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/InWorldPortableGrid.java similarity index 87% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/InWorldPortableGrid.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/InWorldPortableGrid.java index b03248594..9606011b8 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/InWorldPortableGrid.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/InWorldPortableGrid.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.common.storage.portablegrid; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage.api.storage.StateTrackedStorage; -import com.refinedmods.refinedstorage.platform.common.storage.DiskInventory; +import com.refinedmods.refinedstorage.common.storage.DiskInventory; import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGrid.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGrid.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGrid.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGrid.java index b93d7a033..483d8542b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGrid.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGrid.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.common.storage.portablegrid; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; @@ -14,11 +14,11 @@ import com.refinedmods.refinedstorage.api.storage.StorageState; import com.refinedmods.refinedstorage.api.storage.TrackedResourceAmount; import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.storage.DiskInventory; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.common.storage.DiskInventory; import java.util.Collections; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridBlock.java similarity index 86% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridBlock.java index fe0c4df6a..e855c833a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridBlock.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.common.storage.portablegrid; -import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirectionType; -import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; +import com.refinedmods.refinedstorage.common.content.BlockConstants; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.common.support.direction.BiDirectionType; +import com.refinedmods.refinedstorage.common.support.direction.DirectionType; import java.util.function.BiFunction; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridBlockContainerMenu.java similarity index 69% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridBlockContainerMenu.java index 705d9326e..380eb8eb4 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridBlockContainerMenu.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.common.storage.portablegrid; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.grid.PortableGridData; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.grid.PortableGridData; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.containermenu.ServerProperty; import net.minecraft.world.entity.player.Inventory; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockEntityTicker.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridBlockEntityTicker.java similarity index 82% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockEntityTicker.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridBlockEntityTicker.java index 5c581f95e..06cf00e4a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockEntityTicker.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridBlockEntityTicker.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.common.storage.portablegrid; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.AbstractBlockEntityTicker; import java.util.function.Supplier; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridBlockItem.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridBlockItem.java index 1d72f81c1..59fbce896 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridBlockItem.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.common.storage.portablegrid; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; @@ -6,18 +6,18 @@ import com.refinedmods.refinedstorage.api.network.impl.energy.EnergyStorageImpl; import com.refinedmods.refinedstorage.api.storage.StateTrackedStorage; import com.refinedmods.refinedstorage.api.storage.StorageState; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItem; -import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage.platform.api.support.energy.AbstractEnergyBlockItem; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceHandlerItem; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.common.storage.DiskInventory; -import com.refinedmods.refinedstorage.platform.common.support.energy.CreativeEnergyStorage; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.storage.StorageContainerItem; +import com.refinedmods.refinedstorage.common.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.common.api.support.energy.AbstractEnergyBlockItem; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceHandlerItem; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.common.storage.DiskInventory; +import com.refinedmods.refinedstorage.common.support.energy.CreativeEnergyStorage; import java.util.Optional; import javax.annotation.Nullable; @@ -37,7 +37,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class PortableGridBlockItem extends AbstractEnergyBlockItem implements SlotReferenceHandlerItem { private static final Component HELP = createTranslation("item", "portable_grid.help"); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridBlockItemRenderInfo.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridBlockItemRenderInfo.java new file mode 100644 index 000000000..edbdb11ca --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridBlockItemRenderInfo.java @@ -0,0 +1,6 @@ +package com.refinedmods.refinedstorage.common.storage.portablegrid; + +import com.refinedmods.refinedstorage.common.storage.Disk; + +public record PortableGridBlockItemRenderInfo(boolean active, Disk disk) { +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridItemContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridItemContainerMenu.java similarity index 74% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridItemContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridItemContainerMenu.java index 4b38368e8..83dbff994 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridItemContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridItemContainerMenu.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.common.storage.portablegrid; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.grid.PortableGridData; -import com.refinedmods.refinedstorage.platform.common.storage.DiskInventory; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.grid.PortableGridData; +import com.refinedmods.refinedstorage.common.storage.DiskInventory; import net.minecraft.world.entity.player.Inventory; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridItemExtendedMenuProvider.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridItemExtendedMenuProvider.java similarity index 75% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridItemExtendedMenuProvider.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridItemExtendedMenuProvider.java index 3ec8e8479..362cb3939 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridItemExtendedMenuProvider.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridItemExtendedMenuProvider.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.common.storage.portablegrid; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.grid.GridData; -import com.refinedmods.refinedstorage.platform.common.grid.PortableGridData; -import com.refinedmods.refinedstorage.platform.common.storage.DiskInventory; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.grid.GridData; +import com.refinedmods.refinedstorage.common.grid.PortableGridData; +import com.refinedmods.refinedstorage.common.storage.DiskInventory; +import com.refinedmods.refinedstorage.common.support.containermenu.ExtendedMenuProvider; import java.util.Optional; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridLootItemFunction.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridLootItemFunction.java similarity index 81% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridLootItemFunction.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridLootItemFunction.java index be3e5310e..cbfe2f4f9 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridLootItemFunction.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridLootItemFunction.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.common.storage.portablegrid; -import com.refinedmods.refinedstorage.platform.common.content.LootFunctions; -import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyLootItemFunction; +import com.refinedmods.refinedstorage.common.content.LootFunctions; +import com.refinedmods.refinedstorage.common.support.energy.EnergyLootItemFunction; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridOperations.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridOperations.java similarity index 92% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridOperations.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridOperations.java index 617de242a..a4c090d4f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridOperations.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridOperations.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.common.storage.portablegrid; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; @@ -8,7 +8,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.common.Platform; class PortableGridOperations implements GridOperations { private final GridOperations delegate; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridScreen.java similarity index 89% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridScreen.java index df505d25a..914ded857 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridScreen.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.common.storage.portablegrid; -import com.refinedmods.refinedstorage.platform.common.grid.screen.AbstractGridScreen; -import com.refinedmods.refinedstorage.platform.common.support.widget.ProgressWidget; +import com.refinedmods.refinedstorage.common.grid.screen.AbstractGridScreen; +import com.refinedmods.refinedstorage.common.support.widget.ProgressWidget; import javax.annotation.Nullable; @@ -11,7 +11,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public class PortableGridScreen extends AbstractGridScreen { private static final int DISK_SLOT_WIDTH = 30; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridStorage.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridStorage.java similarity index 91% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridStorage.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridStorage.java index 4d50d8b66..4ad9d9abb 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridStorage.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridStorage.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.common.storage.portablegrid; import com.refinedmods.refinedstorage.api.storage.StateTrackedStorage; import com.refinedmods.refinedstorage.api.storage.StorageState; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridType.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridType.java new file mode 100644 index 000000000..46fb4756f --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridType.java @@ -0,0 +1,6 @@ +package com.refinedmods.refinedstorage.common.storage.portablegrid; + +public enum PortableGridType { + NORMAL, + CREATIVE +} diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/package-info.java new file mode 100644 index 000000000..7cc89c12e --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.storage.portablegrid; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/AbstractStorageBlock.java similarity index 81% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/AbstractStorageBlock.java index 052ec053d..f70618188 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/AbstractStorageBlock.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.common.storage.storageblock; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseBlock; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.AbstractBaseBlock; +import com.refinedmods.refinedstorage.common.support.AbstractBlockEntityTicker; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlockBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/AbstractStorageBlockBlockEntity.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlockBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/AbstractStorageBlockBlockEntity.java index c8d16fc78..84e1c914b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlockBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/AbstractStorageBlockBlockEntity.java @@ -1,20 +1,20 @@ -package com.refinedmods.refinedstorage.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.common.storage.storageblock; import com.refinedmods.refinedstorage.api.network.impl.node.AbstractStorageContainerNetworkNode; import com.refinedmods.refinedstorage.api.network.impl.node.storage.StorageNetworkNode; import com.refinedmods.refinedstorage.api.storage.Storage; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage.platform.api.storage.StorageBlockEntity; -import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; -import com.refinedmods.refinedstorage.platform.common.storage.StorageConfigurationContainerImpl; -import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.common.api.storage.StorageBlockEntity; +import com.refinedmods.refinedstorage.common.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceFactory; +import com.refinedmods.refinedstorage.common.storage.StorageConfigurationContainerImpl; +import com.refinedmods.refinedstorage.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; import java.util.Optional; import java.util.UUID; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlockContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/AbstractStorageBlockContainerMenu.java similarity index 74% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlockContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/AbstractStorageBlockContainerMenu.java index 8391f7b20..e315bd92a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlockContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/AbstractStorageBlockContainerMenu.java @@ -1,19 +1,19 @@ -package com.refinedmods.refinedstorage.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.common.storage.storageblock; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; -import com.refinedmods.refinedstorage.platform.common.storage.AbstractStorageContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storage.StorageAccessor; -import com.refinedmods.refinedstorage.platform.common.storage.StorageConfigurationContainer; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlot; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlotType; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceFactory; +import com.refinedmods.refinedstorage.common.storage.AbstractStorageContainerMenu; +import com.refinedmods.refinedstorage.common.storage.StorageAccessor; +import com.refinedmods.refinedstorage.common.storage.StorageConfigurationContainer; +import com.refinedmods.refinedstorage.common.support.containermenu.ResourceSlot; +import com.refinedmods.refinedstorage.common.support.containermenu.ResourceSlotType; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.Slot; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public abstract class AbstractStorageBlockContainerMenu extends AbstractStorageContainerMenu implements StorageAccessor { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlockScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/AbstractStorageBlockScreen.java similarity index 73% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlockScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/AbstractStorageBlockScreen.java index 0dad49c2e..19f05616e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlockScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/AbstractStorageBlockScreen.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.common.storage.storageblock; -import com.refinedmods.refinedstorage.platform.common.storage.AbstractProgressStorageScreen; +import com.refinedmods.refinedstorage.common.storage.AbstractProgressStorageScreen; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; abstract class AbstractStorageBlockScreen extends AbstractProgressStorageScreen { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/storage.png"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlock.java similarity index 64% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlock.java index d462026f8..1c0261f2c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlock.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.common.storage.storageblock; -import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; -import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.common.content.BlockConstants; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockBlockEntity.java similarity index 80% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockBlockEntity.java index f8bd13ccf..308fefb46 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockBlockEntity.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.common.storage.storageblock; import com.refinedmods.refinedstorage.api.network.impl.node.storage.StorageNetworkNode; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.StorageTypes; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.common.storage.StorageTypes; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; @@ -15,7 +15,7 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class FluidStorageBlockBlockEntity extends AbstractStorageBlockBlockEntity { private final FluidStorageVariant variant; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockBlockItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockBlockItem.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockBlockItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockBlockItem.java index 6a7f3fc1f..55790a862 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockBlockItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockBlockItem.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.common.storage.storageblock; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.storage.AbstractStorageContainerBlockItem; -import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; -import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceRendering; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.storage.AbstractStorageContainerBlockItem; +import com.refinedmods.refinedstorage.common.api.support.AmountFormatting; +import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.common.support.resource.FluidResourceRendering; import java.util.Optional; import javax.annotation.Nullable; @@ -21,7 +21,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class FluidStorageBlockBlockItem extends AbstractStorageContainerBlockItem { private static final Component CREATIVE_HELP = createTranslation("item", "creative_fluid_storage_block.help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockContainerMenu.java similarity index 74% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockContainerMenu.java index 288ed0574..fdea5882c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockContainerMenu.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.common.storage.storageblock; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.storage.StorageConfigurationContainer; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.storage.StorageConfigurationContainer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockScreen.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockScreen.java index 4372a29fe..e9e9e344d 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockScreen.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.common.storage.storageblock; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceRendering; +import com.refinedmods.refinedstorage.common.support.resource.FluidResourceRendering; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlock.java similarity index 64% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlock.java index 91197ada2..4b7e9a36d 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlock.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.common.storage.storageblock; -import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; -import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.common.content.BlockConstants; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.storage.ItemStorageVariant; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockBlockEntity.java similarity index 79% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockBlockEntity.java index 9268b894c..840f5be16 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockBlockEntity.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.common.storage.storageblock; import com.refinedmods.refinedstorage.api.network.impl.node.storage.StorageNetworkNode; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.StorageTypes; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.storage.ItemStorageVariant; +import com.refinedmods.refinedstorage.common.storage.StorageTypes; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; @@ -15,7 +15,7 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class ItemStorageBlockBlockEntity extends AbstractStorageBlockBlockEntity { private final ItemStorageVariant variant; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockBlockItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockBlockItem.java similarity index 77% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockBlockItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockBlockItem.java index c3745101d..2e1be41b5 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockBlockItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockBlockItem.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.common.storage.storageblock; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.storage.AbstractStorageContainerBlockItem; -import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; -import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.storage.AbstractStorageContainerBlockItem; +import com.refinedmods.refinedstorage.common.api.support.AmountFormatting; +import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.common.storage.ItemStorageVariant; import java.util.Optional; import javax.annotation.Nullable; @@ -20,7 +20,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class ItemStorageBlockBlockItem extends AbstractStorageContainerBlockItem { private static final Component CREATIVE_HELP = createTranslation("item", "creative_storage_block.help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockContainerMenu.java similarity index 73% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockContainerMenu.java index 8d1205b1d..366b57b45 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockContainerMenu.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.common.storage.storageblock; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.storage.StorageConfigurationContainer; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.storage.StorageConfigurationContainer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockScreen.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockScreen.java index 408c0e44d..fbae1c186 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockScreen.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.common.storage.storageblock; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/StorageBlockData.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/StorageBlockData.java similarity index 78% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/StorageBlockData.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/StorageBlockData.java index 405134f9c..fbaf7ea16 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/StorageBlockData.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/StorageBlockData.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.common.storage.storageblock; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/StorageBlockLootItemFunction.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/StorageBlockLootItemFunction.java similarity index 77% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/StorageBlockLootItemFunction.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/StorageBlockLootItemFunction.java index 465ed152f..b37b4ae25 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/StorageBlockLootItemFunction.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/StorageBlockLootItemFunction.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.common.storage.storageblock; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.storage.StorageBlockEntity; -import com.refinedmods.refinedstorage.platform.common.content.LootFunctions; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.storage.StorageBlockEntity; +import com.refinedmods.refinedstorage.common.content.LootFunctions; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/package-info.java new file mode 100644 index 000000000..6bcaca763 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.storage.storageblock; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/FluidStorageDiskItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storagedisk/FluidStorageDiskItem.java similarity index 69% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/FluidStorageDiskItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storagedisk/FluidStorageDiskItem.java index e5d14d944..b8d6c35e7 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/FluidStorageDiskItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storagedisk/FluidStorageDiskItem.java @@ -1,15 +1,15 @@ -package com.refinedmods.refinedstorage.platform.common.storage.storagedisk; +package com.refinedmods.refinedstorage.common.storage.storagedisk; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.storage.AbstractStorageContainerItem; -import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; -import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.StorageTypes; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceRendering; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.storage.AbstractStorageContainerItem; +import com.refinedmods.refinedstorage.common.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.common.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.common.api.support.AmountFormatting; +import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.common.storage.StorageTypes; +import com.refinedmods.refinedstorage.common.support.resource.FluidResourceRendering; import java.util.Optional; import javax.annotation.Nullable; @@ -19,7 +19,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class FluidStorageDiskItem extends AbstractStorageContainerItem { private static final Component CREATIVE_HELP = createTranslation("item", "creative_fluid_storage_disk.help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/ItemStorageDiskItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storagedisk/ItemStorageDiskItem.java similarity index 69% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/ItemStorageDiskItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storagedisk/ItemStorageDiskItem.java index 153bafb96..f12be35e6 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/ItemStorageDiskItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storagedisk/ItemStorageDiskItem.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.storage.storagedisk; +package com.refinedmods.refinedstorage.common.storage.storagedisk; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.storage.AbstractStorageContainerItem; -import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; -import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.StorageTypes; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.storage.AbstractStorageContainerItem; +import com.refinedmods.refinedstorage.common.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.common.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.common.api.support.AmountFormatting; +import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.common.storage.ItemStorageVariant; +import com.refinedmods.refinedstorage.common.storage.StorageTypes; import java.util.Optional; import javax.annotation.Nullable; @@ -18,7 +18,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class ItemStorageDiskItem extends AbstractStorageContainerItem { private static final Component CREATIVE_HELP = createTranslation("item", "creative_storage_disk.help"); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storagedisk/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storagedisk/package-info.java new file mode 100644 index 000000000..ff4bca92b --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storagedisk/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.storage.storagedisk; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/CompositeStorageMonitorExtractionStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/CompositeStorageMonitorExtractionStrategy.java similarity index 86% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/CompositeStorageMonitorExtractionStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/CompositeStorageMonitorExtractionStrategy.java index 055531047..cff96de1e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/CompositeStorageMonitorExtractionStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/CompositeStorageMonitorExtractionStrategy.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.storagemonitor; +package com.refinedmods.refinedstorage.common.storagemonitor; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorExtractionStrategy; +import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorExtractionStrategy; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/CompositeStorageMonitorInsertionStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/CompositeStorageMonitorInsertionStrategy.java similarity index 85% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/CompositeStorageMonitorInsertionStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/CompositeStorageMonitorInsertionStrategy.java index 64ab92ce9..8ad131487 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/CompositeStorageMonitorInsertionStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/CompositeStorageMonitorInsertionStrategy.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.storagemonitor; +package com.refinedmods.refinedstorage.common.storagemonitor; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorInsertionStrategy; +import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorInsertionStrategy; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/FluidStorageMonitorExtractionStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/FluidStorageMonitorExtractionStrategy.java similarity index 77% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/FluidStorageMonitorExtractionStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/FluidStorageMonitorExtractionStrategy.java index 1db48d11d..7533ca209 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/FluidStorageMonitorExtractionStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/FluidStorageMonitorExtractionStrategy.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.storagemonitor; +package com.refinedmods.refinedstorage.common.storagemonitor; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; @@ -6,10 +6,10 @@ import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.TransferHelper; import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorExtractionStrategy; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.storage.BucketPlayerInventoryInsertableStorage; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorExtractionStrategy; +import com.refinedmods.refinedstorage.common.storage.BucketPlayerInventoryInsertableStorage; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; import net.minecraft.world.entity.player.Player; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java similarity index 85% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java index dea78b2ba..41e5e3368 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.storagemonitor; +package com.refinedmods.refinedstorage.common.storagemonitor; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.Network; @@ -6,10 +6,10 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorInsertionStrategy; -import com.refinedmods.refinedstorage.platform.api.support.resource.FluidOperationResult; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorInsertionStrategy; +import com.refinedmods.refinedstorage.common.api.support.resource.FluidOperationResult; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; import java.util.Optional; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java index 1fdbd1fc7..99fc0e8c6 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.storagemonitor; +package com.refinedmods.refinedstorage.common.storagemonitor; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorExtractionStrategy; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorExtractionStrategy; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/ItemStorageMonitorInsertionStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/ItemStorageMonitorInsertionStrategy.java similarity index 85% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/ItemStorageMonitorInsertionStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/ItemStorageMonitorInsertionStrategy.java index 9d85bf6ed..47f40dbfc 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/ItemStorageMonitorInsertionStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/ItemStorageMonitorInsertionStrategy.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.storagemonitor; +package com.refinedmods.refinedstorage.common.storagemonitor; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorInsertionStrategy; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorInsertionStrategy; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlock.java similarity index 81% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlock.java index 1af6df35f..6168adf7b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlock.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.storagemonitor; +package com.refinedmods.refinedstorage.common.storagemonitor; -import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirectionType; -import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; -import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.common.content.BlockConstants; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.common.support.direction.BiDirectionType; +import com.refinedmods.refinedstorage.common.support.direction.DirectionType; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker; import javax.annotation.Nullable; @@ -30,7 +30,7 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class StorageMonitorBlock extends AbstractDirectionalBlock implements EntityBlock { private static final Component HELP = createTranslation("item", "storage_monitor.help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlockEntity.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlockEntity.java index f7a4e2330..3d31cb6f2 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlockEntity.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.storagemonitor; +package com.refinedmods.refinedstorage.common.storagemonitor; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; @@ -6,20 +6,20 @@ import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage.platform.api.storage.channel.FuzzyStorageChannel; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.common.api.storage.channel.FuzzyStorageChannel; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlockEntityRenderer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlockEntityRenderer.java similarity index 92% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlockEntityRenderer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlockEntityRenderer.java index ad55a397a..5489bcff1 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlockEntityRenderer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlockEntityRenderer.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.storagemonitor; +package com.refinedmods.refinedstorage.common.storagemonitor; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceRendering; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirectionType; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceRendering; +import com.refinedmods.refinedstorage.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.common.support.direction.BiDirectionType; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorContainerMenu.java similarity index 63% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorContainerMenu.java index 9794ef467..5a2633394 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorContainerMenu.java @@ -1,22 +1,22 @@ -package com.refinedmods.refinedstorage.platform.common.storagemonitor; +package com.refinedmods.refinedstorage.common.storagemonitor; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlot; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlotType; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.containermenu.ResourceSlot; +import com.refinedmods.refinedstorage.common.support.containermenu.ResourceSlotType; +import com.refinedmods.refinedstorage.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class StorageMonitorContainerMenu extends AbstractResourceContainerMenu { private static final Component FILTER_HELP = createTranslation("gui", "storage_monitor.filter_help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorInsertTracker.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorInsertTracker.java similarity index 87% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorInsertTracker.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorInsertTracker.java index 2ee78886b..328a19653 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorInsertTracker.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorInsertTracker.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.storagemonitor; +package com.refinedmods.refinedstorage.common.storagemonitor; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.util.HashMap; import java.util.Map; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorScreen.java similarity index 68% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorScreen.java index c52c2d38f..483bddc7b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorScreen.java @@ -1,15 +1,15 @@ -package com.refinedmods.refinedstorage.platform.common.storagemonitor; +package com.refinedmods.refinedstorage.common.storagemonitor; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.widget.FuzzyModeSideButtonWidget; -import com.refinedmods.refinedstorage.platform.common.support.widget.RedstoneModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.widget.FuzzyModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.widget.RedstoneModeSideButtonWidget; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public class StorageMonitorScreen extends AbstractBaseScreen { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/storage_monitor.png"); diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/package-info.java similarity index 77% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter/package-info.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/package-info.java index 8fccdbded..08a5218e1 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter/package-info.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.exporter; +package com.refinedmods.refinedstorage.common.storagemonitor; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractActiveColoredDirectionalBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractActiveColoredDirectionalBlock.java similarity index 96% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractActiveColoredDirectionalBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractActiveColoredDirectionalBlock.java index 7da5d14da..f11939e12 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractActiveColoredDirectionalBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractActiveColoredDirectionalBlock.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; import net.minecraft.network.chat.MutableComponent; import net.minecraft.util.StringRepresentable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseBlock.java similarity index 94% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseBlock.java index 654261089..37ccef995 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseBlock.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.network.NetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.Sounds; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeMenuProvider; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.Sounds; +import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeMenuProvider; import java.util.Optional; import javax.annotation.Nullable; @@ -36,7 +36,7 @@ import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.VoxelShape; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public abstract class AbstractBaseBlock extends Block { private static final TagKey WRENCH_TAG = TagKey.create( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseContainerMenu.java similarity index 82% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseContainerMenu.java index 544bf430f..857aafcc9 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseContainerMenu.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.support; - -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.DisabledSlot; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.Property; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyType; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferManager; +package com.refinedmods.refinedstorage.common.support; + +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.DisabledSlot; +import com.refinedmods.refinedstorage.common.support.containermenu.Property; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyType; +import com.refinedmods.refinedstorage.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.TransferManager; import java.util.HashMap; import java.util.Map; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseScreen.java similarity index 89% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseScreen.java index 73100def1..a06641b5e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseScreen.java @@ -1,21 +1,21 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceRendering; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeMapping; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.support.amount.ResourceAmountScreen; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlot; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.HelpClientTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseClientTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.SmallTextClientTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeItemClientTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeSlot; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceFactory; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceRendering; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeMapping; +import com.refinedmods.refinedstorage.common.support.amount.ResourceAmountScreen; +import com.refinedmods.refinedstorage.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.common.support.containermenu.ResourceSlot; +import com.refinedmods.refinedstorage.common.support.tooltip.HelpClientTooltipComponent; +import com.refinedmods.refinedstorage.common.support.tooltip.MouseClientTooltipComponent; +import com.refinedmods.refinedstorage.common.support.tooltip.SmallTextClientTooltipComponent; +import com.refinedmods.refinedstorage.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeItemClientTooltipComponent; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeSlot; import java.util.ArrayList; import java.util.Collections; @@ -36,7 +36,7 @@ import net.minecraft.world.item.ItemStack; import org.apiguardian.api.API; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslationAsHeading; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslationAsHeading; import static java.util.Objects.requireNonNullElse; public abstract class AbstractBaseScreen extends AbstractContainerScreen { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBlockEntityTicker.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBlockEntityTicker.java similarity index 93% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBlockEntityTicker.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBlockEntityTicker.java index d51d8b715..c05779d9a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBlockEntityTicker.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBlockEntityTicker.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractColoredBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractColoredBlock.java similarity index 92% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractColoredBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractColoredBlock.java index 53881b263..8ff35f56a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractColoredBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractColoredBlock.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.DyeColor; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractDirectionalBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractDirectionalBlock.java similarity index 95% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractDirectionalBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractDirectionalBlock.java index c358b8846..fdd2d1f28 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractDirectionalBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractDirectionalBlock.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; -import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; +import com.refinedmods.refinedstorage.common.support.direction.DirectionType; import java.util.Objects; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractDirectionalCableBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractDirectionalCableBlock.java similarity index 94% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractDirectionalCableBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractDirectionalCableBlock.java index a419bb3d8..ad11b4043 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractDirectionalCableBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractDirectionalCableBlock.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; -import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage.platform.common.support.direction.DefaultDirectionType; -import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; +import com.refinedmods.refinedstorage.common.content.BlockConstants; +import com.refinedmods.refinedstorage.common.support.direction.DefaultDirectionType; +import com.refinedmods.refinedstorage.common.support.direction.DirectionType; import java.util.Map; import java.util.Objects; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractFilterScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractFilterScreen.java similarity index 74% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractFilterScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractFilterScreen.java index 490e088d3..de82c7433 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractFilterScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractFilterScreen.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.widget.RedstoneModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.widget.RedstoneModeSideButtonWidget; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public abstract class AbstractFilterScreen extends AbstractBaseScreen { public static final ResourceLocation TEXTURE = createIdentifier("textures/gui/generic_filter.png"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractPlatformSavedData.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractPlatformSavedData.java similarity index 74% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractPlatformSavedData.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractPlatformSavedData.java index 5ce78d0a7..e9d409761 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractPlatformSavedData.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractPlatformSavedData.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; -import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.common.Platform; import java.io.File; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/BaseBlockItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/BaseBlockItem.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/BaseBlockItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/BaseBlockItem.java index c9def43b6..a72a7cb09 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/BaseBlockItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/BaseBlockItem.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; -import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; import java.util.Optional; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/BlockEntityWithDrops.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/BlockEntityWithDrops.java similarity index 74% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/BlockEntityWithDrops.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/BlockEntityWithDrops.java index 2595dc3cd..1527d6f83 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/BlockEntityWithDrops.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/BlockEntityWithDrops.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; import net.minecraft.core.NonNullList; import net.minecraft.world.item.ItemStack; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/BlockItemProvider.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/BlockItemProvider.java similarity index 70% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/BlockItemProvider.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/BlockItemProvider.java index 520362875..193ed8dd6 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/BlockItemProvider.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/BlockItemProvider.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; import net.minecraft.world.item.BlockItem; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/CableBlockSupport.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/CableBlockSupport.java similarity index 96% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/CableBlockSupport.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/CableBlockSupport.java index 4e781e344..213f87f89 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/CableBlockSupport.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/CableBlockSupport.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; -import com.refinedmods.refinedstorage.platform.api.support.network.NetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerBlockEntity; import java.util.HashMap; import java.util.Map; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/CableShapeCacheKey.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/CableShapeCacheKey.java new file mode 100644 index 000000000..b3f456736 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/CableShapeCacheKey.java @@ -0,0 +1,16 @@ +package com.refinedmods.refinedstorage.common.support; + +import net.minecraft.world.level.block.state.BlockState; + +public record CableShapeCacheKey(boolean north, boolean east, boolean south, boolean west, boolean up, boolean down) { + public static CableShapeCacheKey of(final BlockState state) { + return new CableShapeCacheKey( + state.getValue(CableBlockSupport.NORTH), + state.getValue(CableBlockSupport.EAST), + state.getValue(CableBlockSupport.SOUTH), + state.getValue(CableBlockSupport.WEST), + state.getValue(CableBlockSupport.UP), + state.getValue(CableBlockSupport.DOWN) + ); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/ColorableBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/ColorableBlock.java similarity index 74% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/ColorableBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/ColorableBlock.java index abe75dbf6..e678f310b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/ColorableBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/ColorableBlock.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.DyeColor; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/DirectionalCableBlockShapes.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/DirectionalCableBlockShapes.java similarity index 98% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/DirectionalCableBlockShapes.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/DirectionalCableBlockShapes.java index eea87dc4b..ca852f48f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/DirectionalCableBlockShapes.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/DirectionalCableBlockShapes.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilterModeSettings.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/FilterModeSettings.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilterModeSettings.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/FilterModeSettings.java index 1c42e23b2..a8630da19 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilterModeSettings.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/FilterModeSettings.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilterWithFuzzyMode.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/FilterWithFuzzyMode.java similarity index 94% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilterWithFuzzyMode.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/FilterWithFuzzyMode.java index 9755f79a7..40bdc8e66 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilterWithFuzzyMode.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/FilterWithFuzzyMode.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.FuzzyModeNormalizer; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.api.support.resource.FuzzyModeNormalizer; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; import java.util.List; import java.util.Set; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilteredContainer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/FilteredContainer.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilteredContainer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/FilteredContainer.java index 6460eae4c..933dd8e1e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilteredContainer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/FilteredContainer.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; import java.util.function.Predicate; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/NetworkNodeBlockItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/NetworkNodeBlockItem.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/NetworkNodeBlockItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/NetworkNodeBlockItem.java index c7f2a334a..3baf8a5f8 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/NetworkNodeBlockItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/NetworkNodeBlockItem.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.PlatformApi; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/PlayerAwareBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/PlayerAwareBlockEntity.java similarity index 62% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/PlayerAwareBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/PlayerAwareBlockEntity.java index 4442c240a..ab42f832e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/PlayerAwareBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/PlayerAwareBlockEntity.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; import java.util.UUID; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/RedstoneMode.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/RedstoneMode.java similarity index 87% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/RedstoneMode.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/RedstoneMode.java index 0ab863e52..b6f863137 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/RedstoneMode.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/RedstoneMode.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; public enum RedstoneMode { IGNORE, diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/RedstoneModeSettings.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/RedstoneModeSettings.java similarity index 91% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/RedstoneModeSettings.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/RedstoneModeSettings.java index 7db3531ed..4313057eb 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/RedstoneModeSettings.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/RedstoneModeSettings.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; public class RedstoneModeSettings { private static final int IGNORE = 0; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SchedulingMode.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/SchedulingMode.java similarity index 97% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SchedulingMode.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/SchedulingMode.java index 1948d9fb9..55e7aa2a8 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SchedulingMode.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/SchedulingMode.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; import com.refinedmods.refinedstorage.api.network.node.task.TaskExecutor; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SchedulingModeType.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/SchedulingModeType.java similarity index 94% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SchedulingModeType.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/SchedulingModeType.java index fcddfbe3f..3f85ed1e0 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SchedulingModeType.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/SchedulingModeType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; import com.refinedmods.refinedstorage.api.network.impl.node.task.DefaultTaskExecutor; import com.refinedmods.refinedstorage.api.network.impl.node.task.RandomTaskExecutor; @@ -11,7 +11,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public enum SchedulingModeType { DEFAULT( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SimpleBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/SimpleBlock.java similarity index 54% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SimpleBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/SimpleBlock.java index 412af2fbf..feb3b70ab 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SimpleBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/SimpleBlock.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; -import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; +import com.refinedmods.refinedstorage.common.content.BlockConstants; import net.minecraft.world.level.block.Block; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SimpleItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/SimpleItem.java similarity index 71% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SimpleItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/SimpleItem.java index d1cc9f98f..644fe0f74 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SimpleItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/SimpleItem.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; import net.minecraft.world.item.Item; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/TextureIds.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/TextureIds.java similarity index 56% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/TextureIds.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/TextureIds.java index 0638b62b7..e4fb3e004 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/TextureIds.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/TextureIds.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.support; +package com.refinedmods.refinedstorage.common.support; import net.minecraft.resources.ResourceLocation; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public final class TextureIds { public static final ResourceLocation ICONS = createIdentifier("textures/icons.png"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AbstractAmountScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/AbstractAmountScreen.java similarity index 97% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AbstractAmountScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/AbstractAmountScreen.java index 6a2f43bf3..2bb68a09f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AbstractAmountScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/AbstractAmountScreen.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support.amount; +package com.refinedmods.refinedstorage.common.support.amount; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.common.support.AbstractBaseScreen; import java.util.Objects; import java.util.Optional; @@ -21,7 +21,7 @@ import org.joml.Vector3f; import org.lwjgl.glfw.GLFW; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public abstract class AbstractAmountScreen extends AbstractBaseScreen { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AbstractSingleAmountScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/AbstractSingleAmountScreen.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AbstractSingleAmountScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/AbstractSingleAmountScreen.java index c11289707..f6e776983 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AbstractSingleAmountScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/AbstractSingleAmountScreen.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support.amount; +package com.refinedmods.refinedstorage.common.support.amount; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractSingleAmountContainerMenu; +import com.refinedmods.refinedstorage.common.support.containermenu.AbstractSingleAmountContainerMenu; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; @@ -8,7 +8,7 @@ import net.minecraft.world.entity.player.Inventory; import org.joml.Vector3f; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public abstract class AbstractSingleAmountScreen extends AbstractAmountScreen { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AmountOperations.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/AmountOperations.java similarity index 83% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AmountOperations.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/AmountOperations.java index fc65187f0..e2955b221 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AmountOperations.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/AmountOperations.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.amount; +package com.refinedmods.refinedstorage.common.support.amount; import java.util.Optional; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AmountScreenConfiguration.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/AmountScreenConfiguration.java similarity index 99% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AmountScreenConfiguration.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/AmountScreenConfiguration.java index 77ed7fc74..e0d1e0193 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AmountScreenConfiguration.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/AmountScreenConfiguration.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.amount; +package com.refinedmods.refinedstorage.common.support.amount; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/DoubleAmountOperations.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/DoubleAmountOperations.java similarity index 96% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/DoubleAmountOperations.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/DoubleAmountOperations.java index 683eaa9c4..6df699dbf 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/DoubleAmountOperations.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/DoubleAmountOperations.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.amount; +package com.refinedmods.refinedstorage.common.support.amount; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/IntegerAmountOperations.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/IntegerAmountOperations.java similarity index 95% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/IntegerAmountOperations.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/IntegerAmountOperations.java index e3d286e25..b70ac5287 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/IntegerAmountOperations.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/IntegerAmountOperations.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.amount; +package com.refinedmods.refinedstorage.common.support.amount; import java.util.Objects; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/LongAmountOperations.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/LongAmountOperations.java similarity index 91% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/LongAmountOperations.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/LongAmountOperations.java index af5becc2e..b2eb529f8 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/LongAmountOperations.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/LongAmountOperations.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support.amount; +package com.refinedmods.refinedstorage.common.support.amount; -import com.refinedmods.refinedstorage.platform.common.util.MathUtil; +import com.refinedmods.refinedstorage.common.util.MathUtil; import java.util.Optional; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/PriorityScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/PriorityScreen.java similarity index 83% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/PriorityScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/PriorityScreen.java index 8991bc0b8..bf53e52dc 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/PriorityScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/PriorityScreen.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support.amount; +package com.refinedmods.refinedstorage.common.support.amount; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.MutableComponent; @@ -8,8 +8,8 @@ import net.minecraft.world.entity.player.Inventory; import org.joml.Vector3f; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class PriorityScreen extends AbstractAmountScreen { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/priority.png"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/ResourceAmountScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/ResourceAmountScreen.java similarity index 82% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/ResourceAmountScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/ResourceAmountScreen.java index 487166c2c..bb2dc979a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/ResourceAmountScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/ResourceAmountScreen.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.support.amount; +package com.refinedmods.refinedstorage.common.support.amount; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlot; +import com.refinedmods.refinedstorage.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.common.support.containermenu.ResourceSlot; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.MutableComponent; @@ -11,8 +11,8 @@ import net.minecraft.world.item.ItemStack; import org.joml.Vector3f; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class ResourceAmountScreen extends AbstractAmountScreen { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/resource_amount.png"); diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/importer/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/package-info.java similarity index 77% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/importer/package-info.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/package-info.java index 3dac8fad9..8cc4fb92b 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/importer/package-info.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/amount/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.importer; +package com.refinedmods.refinedstorage.common.support.amount; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractResourceContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/AbstractResourceContainerMenu.java similarity index 92% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractResourceContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/AbstractResourceContainerMenu.java index 57e8225b0..934a6f5d5 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractResourceContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/AbstractResourceContainerMenu.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage.common.support.packet.c2s.C2SPackets; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractSchedulingContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/AbstractSchedulingContainerMenu.java similarity index 78% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractSchedulingContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/AbstractSchedulingContainerMenu.java index d0e9eba45..117a0a456 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractSchedulingContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/AbstractSchedulingContainerMenu.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage.platform.common.support.SchedulingModeType; -import com.refinedmods.refinedstorage.platform.common.support.network.AbstractSchedulingNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.SchedulingModeType; +import com.refinedmods.refinedstorage.common.support.network.AbstractSchedulingNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Player; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractSimpleFilterContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/AbstractSimpleFilterContainerMenu.java similarity index 83% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractSimpleFilterContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/AbstractSimpleFilterContainerMenu.java index dbb12d34c..0ac713831 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractSimpleFilterContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/AbstractSimpleFilterContainerMenu.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeSlot; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeSlot; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractSingleAmountContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/AbstractSingleAmountContainerMenu.java similarity index 85% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractSingleAmountContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/AbstractSingleAmountContainerMenu.java index 22c7a0c44..4af27096d 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractSingleAmountContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/AbstractSingleAmountContainerMenu.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.support.packet.c2s.C2SPackets; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ClientProperty.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ClientProperty.java similarity index 86% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ClientProperty.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ClientProperty.java index fe54ef52e..71c148491 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ClientProperty.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ClientProperty.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; +import com.refinedmods.refinedstorage.common.support.packet.c2s.C2SPackets; import net.minecraft.world.inventory.DataSlot; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/DisabledSlot.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/DisabledSlot.java similarity index 83% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/DisabledSlot.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/DisabledSlot.java index 7cd362c67..b48c6a53b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/DisabledSlot.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/DisabledSlot.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; import net.minecraft.world.Container; import net.minecraft.world.inventory.Slot; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ExtendedMenuProvider.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ExtendedMenuProvider.java similarity index 79% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ExtendedMenuProvider.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ExtendedMenuProvider.java index 0250634dd..f4d76c5a0 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ExtendedMenuProvider.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ExtendedMenuProvider.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamEncoder; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/MenuOpener.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/MenuOpener.java similarity index 70% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/MenuOpener.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/MenuOpener.java index d89d2c61e..ece4df1bc 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/MenuOpener.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/MenuOpener.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.MenuProvider; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/NetworkNodeExtendedMenuProvider.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/NetworkNodeExtendedMenuProvider.java similarity index 59% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/NetworkNodeExtendedMenuProvider.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/NetworkNodeExtendedMenuProvider.java index 2c4ef6c1a..9d7589eff 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/NetworkNodeExtendedMenuProvider.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/NetworkNodeExtendedMenuProvider.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; public interface NetworkNodeExtendedMenuProvider extends ExtendedMenuProvider, NetworkNodeMenuProvider { } diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/NetworkNodeMenuProvider.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/NetworkNodeMenuProvider.java similarity index 53% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/NetworkNodeMenuProvider.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/NetworkNodeMenuProvider.java index 88c8cba67..36f97d08b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/NetworkNodeMenuProvider.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/NetworkNodeMenuProvider.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; -import com.refinedmods.refinedstorage.platform.api.security.SecurityHelper; -import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage.platform.common.security.BuiltinPermission; +import com.refinedmods.refinedstorage.common.api.security.SecurityHelper; +import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.common.security.BuiltinPermission; import java.util.Set; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/Property.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/Property.java similarity index 67% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/Property.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/Property.java index ce8c87035..665b3712c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/Property.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/Property.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; import net.minecraft.world.inventory.DataSlot; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/PropertyType.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/PropertyType.java similarity index 77% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/PropertyType.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/PropertyType.java index 994f59255..626adbb4c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/PropertyType.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/PropertyType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; import java.util.function.Function; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/PropertyTypes.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/PropertyTypes.java similarity index 74% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/PropertyTypes.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/PropertyTypes.java index 9f7856eb6..9866ec671 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/PropertyTypes.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/PropertyTypes.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage.platform.common.support.FilterModeSettings; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneModeSettings; -import com.refinedmods.refinedstorage.platform.common.support.SchedulingModeType; +import com.refinedmods.refinedstorage.common.support.FilterModeSettings; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.RedstoneModeSettings; +import com.refinedmods.refinedstorage.common.support.SchedulingModeType; import net.minecraft.resources.ResourceLocation; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public final class PropertyTypes { public static final PropertyType REDSTONE_MODE = new PropertyType<>( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceInventoryDestination.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ResourceInventoryDestination.java similarity index 80% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceInventoryDestination.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ResourceInventoryDestination.java index 5d8fda070..6679bb6b3 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceInventoryDestination.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ResourceInventoryDestination.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; import net.minecraft.world.item.ItemStack; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceSlot.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ResourceSlot.java similarity index 93% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceSlot.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ResourceSlot.java index 5a8837a7f..258144c56 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceSlot.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ResourceSlot.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.S2CPackets; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceFactory; +import com.refinedmods.refinedstorage.common.support.packet.c2s.C2SPackets; +import com.refinedmods.refinedstorage.common.support.packet.s2c.S2CPackets; import java.util.Objects; import java.util.Set; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceSlotType.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ResourceSlotType.java similarity index 51% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceSlotType.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ResourceSlotType.java index b33606224..1343775e6 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceSlotType.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ResourceSlotType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; public enum ResourceSlotType { FILTER, diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ServerProperty.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ServerProperty.java similarity index 92% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ServerProperty.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ServerProperty.java index 02364e590..369374d9f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ServerProperty.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ServerProperty.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; import java.util.function.Consumer; import java.util.function.Supplier; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/SingleAmountData.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/SingleAmountData.java similarity index 68% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/SingleAmountData.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/SingleAmountData.java index 448f3e9d1..bc0896032 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/SingleAmountData.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/SingleAmountData.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceFactory; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceFactory; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/TransferDestination.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/TransferDestination.java similarity index 71% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/TransferDestination.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/TransferDestination.java index 32bc8ce79..03c219f38 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/TransferDestination.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/TransferDestination.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/TransferManager.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/TransferManager.java similarity index 97% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/TransferManager.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/TransferManager.java index ffd6683f4..1aece6cbf 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/TransferManager.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/TransferManager.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; import java.util.HashMap; import java.util.LinkedList; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ValidatedSlot.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ValidatedSlot.java similarity index 86% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ValidatedSlot.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ValidatedSlot.java index 9bc6631fe..b4c14542a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ValidatedSlot.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ValidatedSlot.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.common.support.containermenu; -import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItem; +import com.refinedmods.refinedstorage.common.api.storage.StorageContainerItem; import java.util.function.Predicate; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/package-info.java new file mode 100644 index 000000000..3771a46fa --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.support.containermenu; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/BiDirection.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/BiDirection.java similarity index 97% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/BiDirection.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/BiDirection.java index 8bb74ce45..fa9e42996 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/BiDirection.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/BiDirection.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.direction; +package com.refinedmods.refinedstorage.common.support.direction; import java.util.Locale; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/BiDirectionType.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/BiDirectionType.java similarity index 95% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/BiDirectionType.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/BiDirectionType.java index 38f47b242..a03ecd858 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/BiDirectionType.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/BiDirectionType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.direction; +package com.refinedmods.refinedstorage.common.support.direction; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.properties.EnumProperty; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/DefaultDirectionType.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/DefaultDirectionType.java similarity index 95% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/DefaultDirectionType.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/DefaultDirectionType.java index 05e896dca..a2300ca1d 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/DefaultDirectionType.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/DefaultDirectionType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.direction; +package com.refinedmods.refinedstorage.common.support.direction; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.properties.EnumProperty; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/DirectionType.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/DirectionType.java similarity index 85% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/DirectionType.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/DirectionType.java index b8ac9744c..17286ca62 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/DirectionType.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/DirectionType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.direction; +package com.refinedmods.refinedstorage.common.support.direction; import net.minecraft.core.Direction; import net.minecraft.util.StringRepresentable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/HorizontalDirection.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/HorizontalDirection.java similarity index 83% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/HorizontalDirection.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/HorizontalDirection.java index d8a6516ee..7c70d42f2 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/HorizontalDirection.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/HorizontalDirection.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.direction; +package com.refinedmods.refinedstorage.common.support.direction; import java.util.Locale; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/HorizontalDirectionType.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/HorizontalDirectionType.java similarity index 96% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/HorizontalDirectionType.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/HorizontalDirectionType.java index 857d50b0c..636ae3305 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/HorizontalDirectionType.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/HorizontalDirectionType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.direction; +package com.refinedmods.refinedstorage.common.support.direction; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.properties.EnumProperty; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/package-info.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/package-info.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/package-info.java index 41a347413..181b6db7e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/package-info.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/direction/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.security; +package com.refinedmods.refinedstorage.common.support.direction; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/BlockEntityEnergyStorage.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/BlockEntityEnergyStorage.java similarity index 89% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/BlockEntityEnergyStorage.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/BlockEntityEnergyStorage.java index 7fa4654e0..6ed1632a4 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/BlockEntityEnergyStorage.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/BlockEntityEnergyStorage.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.energy; +package com.refinedmods.refinedstorage.common.support.energy; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage.api.network.impl.energy.AbstractListeningEnergyStorage; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/CreativeEnergyStorage.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/CreativeEnergyStorage.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/CreativeEnergyStorage.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/CreativeEnergyStorage.java index 1cf2f1f75..0b105e47d 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/CreativeEnergyStorage.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/CreativeEnergyStorage.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.energy; +package com.refinedmods.refinedstorage.common.support.energy; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/EnergyContainerMenu.java similarity index 57% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/EnergyContainerMenu.java index 8d0dd9135..78611f2cc 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/EnergyContainerMenu.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.energy; +package com.refinedmods.refinedstorage.common.support.energy; @FunctionalInterface public interface EnergyContainerMenu { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyInfo.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/EnergyInfo.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyInfo.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/EnergyInfo.java index ce92b403d..8d24723b1 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyInfo.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/EnergyInfo.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support.energy; +package com.refinedmods.refinedstorage.common.support.energy; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.S2CPackets; +import com.refinedmods.refinedstorage.common.support.packet.s2c.S2CPackets; import java.util.Collections; import java.util.List; @@ -11,7 +11,7 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createStoredWithCapacityTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createStoredWithCapacityTranslation; public class EnergyInfo { private final Player player; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyItemHelperImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/EnergyItemHelperImpl.java similarity index 85% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyItemHelperImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/EnergyItemHelperImpl.java index bbcabe45b..d816bc0bb 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyItemHelperImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/EnergyItemHelperImpl.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.support.energy; +package com.refinedmods.refinedstorage.common.support.energy; import com.refinedmods.refinedstorage.api.core.Action; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.energy.EnergyItemHelper; -import com.refinedmods.refinedstorage.platform.api.support.energy.TransferableBlockEntityEnergy; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.energy.EnergyItemHelper; +import com.refinedmods.refinedstorage.common.api.support.energy.TransferableBlockEntityEnergy; import java.util.List; @@ -15,7 +15,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createStoredWithCapacityTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createStoredWithCapacityTranslation; public class EnergyItemHelperImpl implements EnergyItemHelper { @Override diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyLootItemFunction.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/EnergyLootItemFunction.java similarity index 80% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyLootItemFunction.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/EnergyLootItemFunction.java index 4cb1740cc..5238f6f63 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyLootItemFunction.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/EnergyLootItemFunction.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.support.energy; +package com.refinedmods.refinedstorage.common.support.energy; import com.refinedmods.refinedstorage.api.core.Action; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.energy.TransferableBlockEntityEnergy; -import com.refinedmods.refinedstorage.platform.common.content.LootFunctions; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.energy.TransferableBlockEntityEnergy; +import com.refinedmods.refinedstorage.common.content.LootFunctions; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/ItemBlockEnergyStorage.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/ItemBlockEnergyStorage.java similarity index 96% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/ItemBlockEnergyStorage.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/ItemBlockEnergyStorage.java index aad8bc36b..e529731f1 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/ItemBlockEnergyStorage.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/ItemBlockEnergyStorage.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.energy; +package com.refinedmods.refinedstorage.common.support.energy; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/ItemEnergyStorage.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/ItemEnergyStorage.java similarity index 85% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/ItemEnergyStorage.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/ItemEnergyStorage.java index f1b45b9d3..38954f500 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/ItemEnergyStorage.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/ItemEnergyStorage.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.support.energy; +package com.refinedmods.refinedstorage.common.support.energy; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage.api.network.impl.energy.AbstractListeningEnergyStorage; -import com.refinedmods.refinedstorage.platform.common.content.DataComponents; +import com.refinedmods.refinedstorage.common.content.DataComponents; import net.minecraft.world.item.ItemStack; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/package-info.java new file mode 100644 index 000000000..7d5caeb33 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.support.energy; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java similarity index 96% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java index d33692c79..31a281524 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.network; +package com.refinedmods.refinedstorage.common.support.network; import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractRedstoneModeNetworkNodeContainerBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/AbstractRedstoneModeNetworkNodeContainerBlockEntity.java similarity index 87% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractRedstoneModeNetworkNodeContainerBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/AbstractRedstoneModeNetworkNodeContainerBlockEntity.java index 9ad681e76..10a83f4e3 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractRedstoneModeNetworkNodeContainerBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/AbstractRedstoneModeNetworkNodeContainerBlockEntity.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.support.network; +package com.refinedmods.refinedstorage.common.support.network; import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage.platform.api.configurationcard.ConfigurationCardTarget; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.support.PlayerAwareBlockEntity; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneModeSettings; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.configurationcard.ConfigurationCardTarget; +import com.refinedmods.refinedstorage.common.support.PlayerAwareBlockEntity; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.RedstoneModeSettings; import java.util.Objects; import java.util.UUID; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractSchedulingNetworkNodeContainerBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/AbstractSchedulingNetworkNodeContainerBlockEntity.java similarity index 81% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractSchedulingNetworkNodeContainerBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/AbstractSchedulingNetworkNodeContainerBlockEntity.java index 191278a99..c9bf5cb52 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractSchedulingNetworkNodeContainerBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/AbstractSchedulingNetworkNodeContainerBlockEntity.java @@ -1,15 +1,15 @@ -package com.refinedmods.refinedstorage.platform.common.support.network; +package com.refinedmods.refinedstorage.common.support.network; import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; import com.refinedmods.refinedstorage.api.network.node.task.TaskExecutor; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage.platform.common.support.SchedulingMode; -import com.refinedmods.refinedstorage.platform.common.support.SchedulingModeType; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.common.support.SchedulingMode; +import com.refinedmods.refinedstorage.common.support.SchedulingModeType; +import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java similarity index 86% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java index 36b9ac59f..46561ab08 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.support.network; +package com.refinedmods.refinedstorage.common.support.network; import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.support.BlockEntityWithDrops; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; -import com.refinedmods.refinedstorage.platform.common.util.ContainerUtil; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.common.support.BlockEntityWithDrops; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.common.util.ContainerUtil; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/BaseNetworkNodeContainerBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/BaseNetworkNodeContainerBlockEntity.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/BaseNetworkNodeContainerBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/BaseNetworkNodeContainerBlockEntity.java index 45c0967d0..4e7eb5615 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/BaseNetworkNodeContainerBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/BaseNetworkNodeContainerBlockEntity.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.support.network; +package com.refinedmods.refinedstorage.common.support.network; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage.platform.api.support.network.AbstractNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionLogic; -import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionSink; -import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemTargetBlockEntity; -import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.ColorableBlock; +import com.refinedmods.refinedstorage.common.api.support.network.AbstractNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionLogic; +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemTargetBlockEntity; +import com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.ColorableBlock; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/ConnectionProviderImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/ConnectionProviderImpl.java similarity index 97% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/ConnectionProviderImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/ConnectionProviderImpl.java index bb0c8df12..6df94dde1 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/ConnectionProviderImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/ConnectionProviderImpl.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.support.network; +package com.refinedmods.refinedstorage.common.support.network; import com.refinedmods.refinedstorage.api.network.ConnectionProvider; import com.refinedmods.refinedstorage.api.network.Connections; import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; -import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage.platform.api.support.network.NetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerBlockEntity; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/ConnectionSinkImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/ConnectionSinkImpl.java similarity index 86% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/ConnectionSinkImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/ConnectionSinkImpl.java index b7078256c..8b3eca64c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/ConnectionSinkImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/ConnectionSinkImpl.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support.network; +package com.refinedmods.refinedstorage.common.support.network; -import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; import java.util.HashSet; import java.util.Set; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/InWorldNetworkNodeContainerImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/InWorldNetworkNodeContainerImpl.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/InWorldNetworkNodeContainerImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/InWorldNetworkNodeContainerImpl.java index df607d062..16d31d47b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/InWorldNetworkNodeContainerImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/InWorldNetworkNodeContainerImpl.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.support.network; +package com.refinedmods.refinedstorage.common.support.network; import com.refinedmods.refinedstorage.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionLogic; -import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionSink; -import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionLogic; +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/NetworkNodeBlockEntityTicker.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/NetworkNodeBlockEntityTicker.java similarity index 89% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/NetworkNodeBlockEntityTicker.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/NetworkNodeBlockEntityTicker.java index 448c7df5c..331b9381d 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/NetworkNodeBlockEntityTicker.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/NetworkNodeBlockEntityTicker.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.support.network; +package com.refinedmods.refinedstorage.common.support.network; import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.AbstractBlockEntityTicker; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemHelperImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/NetworkBoundItemHelperImpl.java similarity index 80% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemHelperImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/NetworkBoundItemHelperImpl.java index 493f1ab44..1e9069026 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemHelperImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/NetworkBoundItemHelperImpl.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.support.network.bounditem; +package com.refinedmods.refinedstorage.common.support.network.bounditem; -import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemHelper; -import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemSession; -import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemTargetBlockEntity; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.common.content.DataComponents; +import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemHelper; +import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemSession; +import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemTargetBlockEntity; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.content.DataComponents; import java.util.List; import java.util.Optional; @@ -21,7 +21,7 @@ import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.block.entity.BlockEntity; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class NetworkBoundItemHelperImpl implements NetworkBoundItemHelper { private static final MutableComponent UNBOUND = createTranslation("item", "network_item.unbound") diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java index f0d6d422e..07706a4d9 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support.network.bounditem; +package com.refinedmods.refinedstorage.common.support.network.bounditem; -import com.refinedmods.refinedstorage.platform.api.support.energy.AbstractNetworkBoundEnergyItem; +import com.refinedmods.refinedstorage.common.api.support.energy.AbstractNetworkBoundEnergyItem; import javax.annotation.Nullable; @@ -10,7 +10,7 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public class NetworkBoundItemItemPropertyFunction implements ClampedItemPropertyFunction { public static final ResourceLocation NAME = createIdentifier("network_bound_active"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemSessionImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/NetworkBoundItemSessionImpl.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemSessionImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/NetworkBoundItemSessionImpl.java index 131bdfdfb..760d4087c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemSessionImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/NetworkBoundItemSessionImpl.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.support.network.bounditem; +package com.refinedmods.refinedstorage.common.support.network.bounditem; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.network.node.GraphNetworkComponent; -import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemSession; -import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemTargetBlockEntity; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitter; -import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemSession; +import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemTargetBlockEntity; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.api.wirelesstransmitter.WirelessTransmitter; import java.util.Optional; import javax.annotation.Nullable; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/package-info.java new file mode 100644 index 000000000..6b5d06a6e --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.support.network.bounditem; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/component/PlatformStorageNetworkComponent.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/component/PlatformStorageNetworkComponent.java similarity index 72% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/component/PlatformStorageNetworkComponent.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/component/PlatformStorageNetworkComponent.java index 77a9f3164..98195ff66 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/component/PlatformStorageNetworkComponent.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/component/PlatformStorageNetworkComponent.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.support.network.component; +package com.refinedmods.refinedstorage.common.support.network.component; import com.refinedmods.refinedstorage.api.network.impl.storage.StorageNetworkComponentImpl; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage.platform.api.storage.channel.FuzzyStorageChannel; -import com.refinedmods.refinedstorage.platform.api.support.resource.list.FuzzyResourceList; -import com.refinedmods.refinedstorage.platform.common.support.resource.list.FuzzyResourceListImpl; +import com.refinedmods.refinedstorage.common.api.storage.channel.FuzzyStorageChannel; +import com.refinedmods.refinedstorage.common.api.support.resource.list.FuzzyResourceList; +import com.refinedmods.refinedstorage.common.support.resource.list.FuzzyResourceListImpl; import java.util.Collection; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/component/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/component/package-info.java new file mode 100644 index 000000000..8b5124b81 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/component/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.support.network.component; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/package-info.java similarity index 76% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/package-info.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/package-info.java index eef99a6e0..13072b67b 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/package-info.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.grid.view; +package com.refinedmods.refinedstorage.common.support.network; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/package-info.java new file mode 100644 index 000000000..8b9d22b9b --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.support; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/PacketContext.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/PacketContext.java similarity index 64% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/PacketContext.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/PacketContext.java index d6a473b78..8a3d5c0f0 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/PacketContext.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/PacketContext.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet; +package com.refinedmods.refinedstorage.common.support.packet; import net.minecraft.world.entity.player.Player; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/PacketHandler.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/PacketHandler.java similarity index 59% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/PacketHandler.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/PacketHandler.java index b4f7be605..ade9694ae 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/PacketHandler.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/PacketHandler.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet; +package com.refinedmods.refinedstorage.common.support.packet; @FunctionalInterface public interface PacketHandler { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/C2SPackets.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/C2SPackets.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/C2SPackets.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/C2SPackets.java index 57cae248f..bf5cf804f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/C2SPackets.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/C2SPackets.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.common.support.packet.c2s; import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyType; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyType; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.util.List; import java.util.UUID; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/CraftingGridClearPacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/CraftingGridClearPacket.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/CraftingGridClearPacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/CraftingGridClearPacket.java index 92707d603..2397c8a0f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/CraftingGridClearPacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/CraftingGridClearPacket.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.common.support.packet.c2s; -import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.grid.CraftingGridContainerMenu; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public record CraftingGridClearPacket(boolean toPlayerInventory) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>(createIdentifier("crafting_grid_clear")); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/CraftingGridRecipeTransferPacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/CraftingGridRecipeTransferPacket.java similarity index 72% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/CraftingGridRecipeTransferPacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/CraftingGridRecipeTransferPacket.java index d041788c0..be2d9e879 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/CraftingGridRecipeTransferPacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/CraftingGridRecipeTransferPacket.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.common.support.packet.c2s; -import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; +import com.refinedmods.refinedstorage.common.grid.CraftingGridContainerMenu; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.resource.ResourceCodecs; import java.util.ArrayList; import java.util.List; @@ -13,7 +13,7 @@ import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public record CraftingGridRecipeTransferPacket(List> recipe) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridExtractPacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/GridExtractPacket.java similarity index 67% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridExtractPacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/GridExtractPacket.java index 340ded865..f8347bd17 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridExtractPacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/GridExtractPacket.java @@ -1,18 +1,18 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.common.support.packet.c2s; import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.support.resource.ResourceCodecs; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage.platform.common.util.PacketUtil.enumStreamCodec; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.PacketUtil.enumStreamCodec; public record GridExtractPacket( PlatformResourceKey resource, diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridInsertPacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/GridInsertPacket.java similarity index 72% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridInsertPacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/GridInsertPacket.java index 3467985bd..d987e14fc 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridInsertPacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/GridInsertPacket.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.common.support.packet.c2s; import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage.platform.common.util.PacketUtil.enumStreamCodec; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.PacketUtil.enumStreamCodec; public record GridInsertPacket(GridInsertMode mode, boolean tryAlternatives) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>(createIdentifier("grid_insert")); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridScrollPacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/GridScrollPacket.java similarity index 63% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridScrollPacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/GridScrollPacket.java index 801e8ba86..af502a242 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridScrollPacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/GridScrollPacket.java @@ -1,18 +1,18 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.common.support.packet.c2s; -import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; +import com.refinedmods.refinedstorage.common.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.support.resource.ResourceCodecs; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage.platform.common.util.PacketUtil.enumStreamCodec; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.PacketUtil.enumStreamCodec; public record GridScrollPacket( PlatformResourceKey resource, diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/PropertyChangePacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/PropertyChangePacket.java similarity index 77% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/PropertyChangePacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/PropertyChangePacket.java index ff59652d4..023074634 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/PropertyChangePacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/PropertyChangePacket.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.common.support.packet.c2s; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; @@ -9,7 +9,7 @@ import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.resources.ResourceLocation; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public record PropertyChangePacket(ResourceLocation propertyId, int value) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>(createIdentifier("property_change")); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/ResourceFilterSlotChangePacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/ResourceFilterSlotChangePacket.java similarity index 71% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/ResourceFilterSlotChangePacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/ResourceFilterSlotChangePacket.java index 9d056c01b..da24baa36 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/ResourceFilterSlotChangePacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/ResourceFilterSlotChangePacket.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.common.support.packet.c2s; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.support.resource.ResourceCodecs; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; import static java.util.Objects.requireNonNull; public record ResourceFilterSlotChangePacket(int slotIndex, PlatformResourceKey resource) diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/ResourceSlotAmountChangePacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/ResourceSlotAmountChangePacket.java similarity index 77% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/ResourceSlotAmountChangePacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/ResourceSlotAmountChangePacket.java index ab4bb76d4..8eb6bbee2 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/ResourceSlotAmountChangePacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/ResourceSlotAmountChangePacket.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.common.support.packet.c2s; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public record ResourceSlotAmountChangePacket(int slotIndex, long amount) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/ResourceSlotChangePacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/ResourceSlotChangePacket.java similarity index 77% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/ResourceSlotChangePacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/ResourceSlotChangePacket.java index 9c6ef003b..75a072e51 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/ResourceSlotChangePacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/ResourceSlotChangePacket.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.common.support.packet.c2s; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public record ResourceSlotChangePacket(int slotIndex, boolean tryAlternatives) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SecurityCardBoundPlayerPacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/SecurityCardBoundPlayerPacket.java similarity index 80% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SecurityCardBoundPlayerPacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/SecurityCardBoundPlayerPacket.java index 3aab91fd2..0541d4705 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SecurityCardBoundPlayerPacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/SecurityCardBoundPlayerPacket.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.common.support.packet.c2s; -import com.refinedmods.refinedstorage.platform.common.security.SecurityCardContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.security.SecurityCardContainerMenu; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; import java.util.UUID; @@ -12,7 +12,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.world.entity.player.Player; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public record SecurityCardBoundPlayerPacket(UUID playerId) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SecurityCardPermissionPacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/SecurityCardPermissionPacket.java similarity index 72% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SecurityCardPermissionPacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/SecurityCardPermissionPacket.java index 6db41c08e..b18761c15 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SecurityCardPermissionPacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/SecurityCardPermissionPacket.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.common.support.packet.c2s; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage.platform.common.security.AbstractSecurityCardContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.common.security.AbstractSecurityCardContainerMenu; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public record SecurityCardPermissionPacket(PlatformPermission permission, boolean allowed) implements CustomPacketPayload { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SecurityCardResetPermissionPacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/SecurityCardResetPermissionPacket.java similarity index 70% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SecurityCardResetPermissionPacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/SecurityCardResetPermissionPacket.java index 283a7226e..f82d79f2a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SecurityCardResetPermissionPacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/SecurityCardResetPermissionPacket.java @@ -1,15 +1,15 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.common.support.packet.c2s; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage.platform.common.security.AbstractSecurityCardContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.common.security.AbstractSecurityCardContainerMenu; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public record SecurityCardResetPermissionPacket(PlatformPermission permission) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SingleAmountChangePacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/SingleAmountChangePacket.java similarity index 75% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SingleAmountChangePacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/SingleAmountChangePacket.java index f86447ebc..a8ae10322 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SingleAmountChangePacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/SingleAmountChangePacket.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.common.support.packet.c2s; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractSingleAmountContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.support.containermenu.AbstractSingleAmountContainerMenu; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public record SingleAmountChangePacket(double amount) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/StorageInfoRequestPacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/StorageInfoRequestPacket.java similarity index 73% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/StorageInfoRequestPacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/StorageInfoRequestPacket.java index feb69f833..220da695b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/StorageInfoRequestPacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/StorageInfoRequestPacket.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.common.support.packet.c2s; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.S2CPackets; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.storage.StorageInfo; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.support.packet.s2c.S2CPackets; import java.util.UUID; @@ -14,7 +14,7 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public record StorageInfoRequestPacket(UUID storageId) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/UseSlotReferencedItemPacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/UseSlotReferencedItemPacket.java similarity index 71% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/UseSlotReferencedItemPacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/UseSlotReferencedItemPacket.java index 7d1d65720..d039c30d3 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/UseSlotReferencedItemPacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/UseSlotReferencedItemPacket.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.common.support.packet.c2s; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceFactory; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceHandlerItem; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceFactory; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceHandlerItem; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; @@ -11,7 +11,7 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public record UseSlotReferencedItemPacket(SlotReference slotReference) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>( diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/package-info.java similarity index 76% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/package-info.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/package-info.java index 0180e5c80..b72ca3e6a 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/package-info.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.neoforge.datagen; +package com.refinedmods.refinedstorage.common.support.packet.c2s; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/package-info.java new file mode 100644 index 000000000..d358b6354 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.support.packet; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/EnergyInfoPacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/EnergyInfoPacket.java similarity index 77% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/EnergyInfoPacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/EnergyInfoPacket.java index 51bbaa440..535f448d3 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/EnergyInfoPacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/EnergyInfoPacket.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; +package com.refinedmods.refinedstorage.common.support.packet.s2c; -import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.support.energy.EnergyContainerMenu; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; @@ -9,7 +9,7 @@ import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.world.inventory.AbstractContainerMenu; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public record EnergyInfoPacket(long stored, long capacity) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>(createIdentifier("energy_info")); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/GridActivePacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/GridActivePacket.java similarity index 81% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/GridActivePacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/GridActivePacket.java index 4d6ca3917..dafa0650d 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/GridActivePacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/GridActivePacket.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; +package com.refinedmods.refinedstorage.common.support.packet.s2c; import com.refinedmods.refinedstorage.api.grid.watcher.GridWatcher; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; @@ -9,7 +9,7 @@ import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.world.inventory.AbstractContainerMenu; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public record GridActivePacket(boolean active) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>(createIdentifier("grid_active")); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/GridClearPacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/GridClearPacket.java similarity index 74% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/GridClearPacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/GridClearPacket.java index c1b69567e..04ad06ea5 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/GridClearPacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/GridClearPacket.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; +package com.refinedmods.refinedstorage.common.support.packet.s2c; -import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.world.inventory.AbstractContainerMenu; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public class GridClearPacket implements CustomPacketPayload { public static final GridClearPacket INSTANCE = new GridClearPacket(); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/GridUpdatePacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/GridUpdatePacket.java similarity index 70% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/GridUpdatePacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/GridUpdatePacket.java index 1d2ab28a1..534396b7e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/GridUpdatePacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/GridUpdatePacket.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; +package com.refinedmods.refinedstorage.common.support.packet.s2c; import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage.platform.common.storage.StorageCodecs; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.common.storage.StorageCodecs; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.support.resource.ResourceCodecs; import java.util.Optional; @@ -14,7 +14,7 @@ import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public record GridUpdatePacket( PlatformResourceKey resource, diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/NetworkTransmitterStatusPacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/NetworkTransmitterStatusPacket.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/NetworkTransmitterStatusPacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/NetworkTransmitterStatusPacket.java index 3d01be7a7..e38accfb6 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/NetworkTransmitterStatusPacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/NetworkTransmitterStatusPacket.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; +package com.refinedmods.refinedstorage.common.support.packet.s2c; -import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterContainerMenu; -import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterData; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.networking.NetworkTransmitterContainerMenu; +import com.refinedmods.refinedstorage.common.networking.NetworkTransmitterData; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; @@ -12,7 +12,7 @@ import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.world.inventory.AbstractContainerMenu; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public record NetworkTransmitterStatusPacket(boolean error, Component message) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/NoPermissionPacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/NoPermissionPacket.java similarity index 79% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/NoPermissionPacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/NoPermissionPacket.java index 08b908dde..0e2908da0 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/NoPermissionPacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/NoPermissionPacket.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; +package com.refinedmods.refinedstorage.common.support.packet.s2c; -import com.refinedmods.refinedstorage.platform.common.util.SecurityToastUtil; +import com.refinedmods.refinedstorage.common.util.SecurityToastUtil; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; @@ -8,7 +8,7 @@ import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public record NoPermissionPacket(Component component) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>(createIdentifier("no_permission")); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/ResourceSlotUpdatePacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/ResourceSlotUpdatePacket.java similarity index 75% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/ResourceSlotUpdatePacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/ResourceSlotUpdatePacket.java index e2854d146..8ddf3703c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/ResourceSlotUpdatePacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/ResourceSlotUpdatePacket.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; +package com.refinedmods.refinedstorage.common.support.packet.s2c; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; +import com.refinedmods.refinedstorage.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.support.resource.ResourceCodecs; import java.util.Optional; @@ -12,7 +12,7 @@ import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public record ResourceSlotUpdatePacket( int slotIndex, diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/S2CPackets.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/S2CPackets.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/S2CPackets.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/S2CPackets.java index 6955bdaac..b02897414 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/S2CPackets.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/S2CPackets.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; +package com.refinedmods.refinedstorage.common.support.packet.s2c; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterData; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.storage.StorageInfo; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.networking.NetworkTransmitterData; import java.util.Optional; import java.util.UUID; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/StorageInfoResponsePacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/StorageInfoResponsePacket.java similarity index 80% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/StorageInfoResponsePacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/StorageInfoResponsePacket.java index b335af780..b03e65b61 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/StorageInfoResponsePacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/StorageInfoResponsePacket.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; +package com.refinedmods.refinedstorage.common.support.packet.s2c; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.common.storage.ClientStorageRepository; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.storage.ClientStorageRepository; import java.util.UUID; @@ -11,7 +11,7 @@ import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public record StorageInfoResponsePacket(UUID storageId, long stored, long capacity) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/WirelessTransmitterRangePacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/WirelessTransmitterRangePacket.java similarity index 75% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/WirelessTransmitterRangePacket.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/WirelessTransmitterRangePacket.java index 7f35dc0ac..993a67aa9 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/WirelessTransmitterRangePacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/WirelessTransmitterRangePacket.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; +package com.refinedmods.refinedstorage.common.support.packet.s2c; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; -import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.WirelessTransmitterContainerMenu; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.common.wirelesstransmitter.WirelessTransmitterContainerMenu; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public record WirelessTransmitterRangePacket(int range) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>( diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/package-info.java similarity index 76% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/package-info.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/package-info.java index 43b91e753..628d06f50 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/package-info.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.neoforge.storage; +package com.refinedmods.refinedstorage.common.support.packet.s2c; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/registry/PlatformRegistryImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/registry/PlatformRegistryImpl.java similarity index 95% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/registry/PlatformRegistryImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/registry/PlatformRegistryImpl.java index ceee95c25..f96eae0be 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/registry/PlatformRegistryImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/registry/PlatformRegistryImpl.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.support.registry; +package com.refinedmods.refinedstorage.common.support.registry; import com.refinedmods.refinedstorage.api.core.CoreValidations; -import com.refinedmods.refinedstorage.platform.api.support.registry.PlatformRegistry; +import com.refinedmods.refinedstorage.common.api.support.registry.PlatformRegistry; import java.util.ArrayList; import java.util.Collections; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/registry/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/registry/package-info.java new file mode 100644 index 000000000..f11829546 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/registry/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.support.registry; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/AbstractDiskLedBlockEntityRenderer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/render/AbstractDiskLedBlockEntityRenderer.java similarity index 89% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/AbstractDiskLedBlockEntityRenderer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/render/AbstractDiskLedBlockEntityRenderer.java index 5099afa6b..494a814ef 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/AbstractDiskLedBlockEntityRenderer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/render/AbstractDiskLedBlockEntityRenderer.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.support.render; +package com.refinedmods.refinedstorage.common.support.render; import com.refinedmods.refinedstorage.api.storage.StorageState; -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.common.support.direction.BiDirection; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/AbstractFluidRenderer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/render/AbstractFluidRenderer.java similarity index 98% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/AbstractFluidRenderer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/render/AbstractFluidRenderer.java index d9546a411..78e2beea1 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/AbstractFluidRenderer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/render/AbstractFluidRenderer.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.render; +package com.refinedmods.refinedstorage.common.support.render; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.BufferBuilder; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/CubeBuilder.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/render/CubeBuilder.java similarity index 98% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/CubeBuilder.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/render/CubeBuilder.java index f3dc24824..595720ab7 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/CubeBuilder.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/render/CubeBuilder.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.render; +package com.refinedmods.refinedstorage.common.support.render; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/FluidRenderer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/render/FluidRenderer.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/FluidRenderer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/render/FluidRenderer.java index e09304332..8a9a06808 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/FluidRenderer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/render/FluidRenderer.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support.render; +package com.refinedmods.refinedstorage.common.support.render; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; import java.util.List; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/render/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/render/package-info.java new file mode 100644 index 000000000..81a734d0c --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/render/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.support.render; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/AbstractResourceContainerContainerAdapter.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/AbstractResourceContainerContainerAdapter.java similarity index 94% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/AbstractResourceContainerContainerAdapter.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/AbstractResourceContainerContainerAdapter.java index 742e533d0..34f3641bc 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/AbstractResourceContainerContainerAdapter.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/AbstractResourceContainerContainerAdapter.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.support.resource; +package com.refinedmods.refinedstorage.common.support.resource; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Player; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/CompositeRecipeModIngredientConverter.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/CompositeRecipeModIngredientConverter.java similarity index 77% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/CompositeRecipeModIngredientConverter.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/CompositeRecipeModIngredientConverter.java index 6946f20a8..95a90073f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/CompositeRecipeModIngredientConverter.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/CompositeRecipeModIngredientConverter.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.support.resource; +package com.refinedmods.refinedstorage.common.support.resource; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.RecipeModIngredientConverter; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.api.support.resource.RecipeModIngredientConverter; import java.util.Collection; import java.util.HashSet; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResource.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResource.java similarity index 77% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResource.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResource.java index 2bc28eab4..5e1c7a564 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResource.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResource.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.support.resource; +package com.refinedmods.refinedstorage.common.support.resource; import com.refinedmods.refinedstorage.api.core.CoreValidations; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.FuzzyModeNormalizer; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.common.api.support.resource.FuzzyModeNormalizer; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceType; import net.minecraft.core.component.DataComponentPatch; import net.minecraft.world.level.material.Fluid; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceContainerInsertStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceContainerInsertStrategy.java similarity index 82% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceContainerInsertStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceContainerInsertStrategy.java index 5b43560c0..06582a71c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceContainerInsertStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceContainerInsertStrategy.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.support.resource; +package com.refinedmods.refinedstorage.common.support.resource; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainerInsertStrategy; -import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainerInsertStrategy; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceFactory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceFactory.java similarity index 74% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceFactory.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceFactory.java index cc5e30dc6..0d14c3fc7 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceFactory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceFactory.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.support.resource; +package com.refinedmods.refinedstorage.common.support.resource; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; -import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceFactory; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceRendering.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceRendering.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceRendering.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceRendering.java index d39a08b71..7086a8d1f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceRendering.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceRendering.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.support.resource; +package com.refinedmods.refinedstorage.common.support.resource; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceRendering; -import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.support.AmountFormatting; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceRendering; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceType.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceType.java similarity index 80% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceType.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceType.java index 3786a523e..f8d6d30e7 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceType.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.resource; +package com.refinedmods.refinedstorage.common.support.resource; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; import com.refinedmods.refinedstorage.api.grid.operations.GridOperationsImpl; @@ -6,11 +6,11 @@ import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.platform.api.support.resource.AbstractResourceType; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.grid.view.FluidGridResource; -import com.refinedmods.refinedstorage.platform.common.support.TextureIds; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.support.resource.AbstractResourceType; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.grid.view.FluidGridResource; +import com.refinedmods.refinedstorage.common.support.TextureIds; import java.util.Optional; @@ -18,7 +18,7 @@ import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; class FluidResourceType extends AbstractResourceType { FluidResourceType() { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResource.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ItemResource.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResource.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ItemResource.java index 18d38fa22..a147b97d0 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResource.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ItemResource.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.support.resource; +package com.refinedmods.refinedstorage.common.support.resource; import com.refinedmods.refinedstorage.api.core.CoreValidations; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.FuzzyModeNormalizer; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.common.api.support.resource.FuzzyModeNormalizer; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceType; import net.minecraft.core.component.DataComponentPatch; import net.minecraft.world.item.Item; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceFactory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ItemResourceFactory.java similarity index 80% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceFactory.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ItemResourceFactory.java index b73422734..d7f16e1e6 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceFactory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ItemResourceFactory.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.support.resource; +package com.refinedmods.refinedstorage.common.support.resource; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceFactory; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceRendering.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ItemResourceRendering.java similarity index 93% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceRendering.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ItemResourceRendering.java index 858cbe0d7..7ea0b9e85 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceRendering.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ItemResourceRendering.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.support.resource; +package com.refinedmods.refinedstorage.common.support.resource; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceRendering; +import com.refinedmods.refinedstorage.common.api.support.AmountFormatting; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceRendering; import java.util.Collections; import java.util.HashMap; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceType.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ItemResourceType.java similarity index 80% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceType.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ItemResourceType.java index bd34688f0..e79bcc7fe 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceType.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ItemResourceType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.resource; +package com.refinedmods.refinedstorage.common.support.resource; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; import com.refinedmods.refinedstorage.api.grid.operations.GridOperationsImpl; @@ -6,11 +6,11 @@ import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.platform.api.support.resource.AbstractResourceType; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.grid.view.ItemGridResource; -import com.refinedmods.refinedstorage.platform.common.support.TextureIds; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.support.resource.AbstractResourceType; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.grid.view.ItemGridResource; +import com.refinedmods.refinedstorage.common.support.TextureIds; import java.util.Optional; @@ -18,7 +18,7 @@ import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; class ItemResourceType extends AbstractResourceType { ItemResourceType() { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceCodecs.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceCodecs.java similarity index 93% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceCodecs.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceCodecs.java index bfa0d16f7..caf3ba22a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceCodecs.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceCodecs.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.support.resource; +package com.refinedmods.refinedstorage.common.support.resource; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceType; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerData.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceContainerData.java similarity index 87% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerData.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceContainerData.java index 899b026d5..e09ed5a89 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerData.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceContainerData.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.support.resource; +package com.refinedmods.refinedstorage.common.support.resource; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceContainerImpl.java similarity index 96% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceContainerImpl.java index a026838a7..d860fcc0f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceContainerImpl.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.support.resource; +package com.refinedmods.refinedstorage.common.support.resource; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.core.CoreValidations; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; -import com.refinedmods.refinedstorage.platform.common.util.MathUtil; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceFactory; +import com.refinedmods.refinedstorage.common.util.MathUtil; import java.util.ArrayList; import java.util.Collections; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerSlot.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceContainerSlot.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerSlot.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceContainerSlot.java index 254da8a1c..b8eff1aed 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerSlot.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceContainerSlot.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.support.resource; +package com.refinedmods.refinedstorage.common.support.resource; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; import java.util.Objects; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceTypes.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceTypes.java similarity index 57% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceTypes.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceTypes.java index 6f98902ab..7fcfffb3f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceTypes.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceTypes.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support.resource; +package com.refinedmods.refinedstorage.common.support.resource; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceType; public final class ResourceTypes { public static final ResourceType ITEM = new ItemResourceType(); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/FuzzyResourceListImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/list/FuzzyResourceListImpl.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/FuzzyResourceListImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/list/FuzzyResourceListImpl.java index 14890b604..ad6eb1bff 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/FuzzyResourceListImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/list/FuzzyResourceListImpl.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.support.resource.list; +package com.refinedmods.refinedstorage.common.support.resource.list; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.resource.list.AbstractProxyResourceList; import com.refinedmods.refinedstorage.api.resource.list.ResourceList; -import com.refinedmods.refinedstorage.platform.api.support.resource.FuzzyModeNormalizer; -import com.refinedmods.refinedstorage.platform.api.support.resource.list.FuzzyResourceList; +import com.refinedmods.refinedstorage.common.api.support.resource.FuzzyModeNormalizer; +import com.refinedmods.refinedstorage.common.api.support.resource.list.FuzzyResourceList; import java.util.Collection; import java.util.Collections; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/list/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/list/package-info.java new file mode 100644 index 000000000..44c3bc303 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/list/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.support.resource.list; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/package-info.java new file mode 100644 index 000000000..146402820 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.support.resource; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/slotreference/CompositeSlotReferenceProvider.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/slotreference/CompositeSlotReferenceProvider.java similarity index 83% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/slotreference/CompositeSlotReferenceProvider.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/slotreference/CompositeSlotReferenceProvider.java index f01a8cf60..dec851288 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/slotreference/CompositeSlotReferenceProvider.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/slotreference/CompositeSlotReferenceProvider.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.support.slotreference; +package com.refinedmods.refinedstorage.common.support.slotreference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceProvider; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceProvider; import java.util.ArrayList; import java.util.List; @@ -12,7 +12,7 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class CompositeSlotReferenceProvider implements SlotReferenceProvider { private final List providers = new ArrayList<>(List.of( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/slotreference/InventorySlotReference.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/slotreference/InventorySlotReference.java similarity index 81% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/slotreference/InventorySlotReference.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/slotreference/InventorySlotReference.java index 5af624b67..c1dddcd89 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/slotreference/InventorySlotReference.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/slotreference/InventorySlotReference.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.support.slotreference; +package com.refinedmods.refinedstorage.common.support.slotreference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceFactory; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceFactory; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/slotreference/InventorySlotReferenceFactory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/slotreference/InventorySlotReferenceFactory.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/slotreference/InventorySlotReferenceFactory.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/slotreference/InventorySlotReferenceFactory.java index ec6f5660b..7e6b9deb9 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/slotreference/InventorySlotReferenceFactory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/slotreference/InventorySlotReferenceFactory.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.support.slotreference; +package com.refinedmods.refinedstorage.common.support.slotreference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceFactory; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceFactory; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/slotreference/InventorySlotReferenceProvider.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/slotreference/InventorySlotReferenceProvider.java similarity index 75% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/slotreference/InventorySlotReferenceProvider.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/slotreference/InventorySlotReferenceProvider.java index d5ec557e1..a72c1516e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/slotreference/InventorySlotReferenceProvider.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/slotreference/InventorySlotReferenceProvider.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.support.slotreference; +package com.refinedmods.refinedstorage.common.support.slotreference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceProvider; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceProvider; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/slotreference/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/slotreference/package-info.java new file mode 100644 index 000000000..14aebfcd7 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/slotreference/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.support.slotreference; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/AbstractStretchingScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/stretching/AbstractStretchingScreen.java similarity index 94% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/AbstractStretchingScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/stretching/AbstractStretchingScreen.java index ce271e0fd..d1a71632a 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/AbstractStretchingScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/stretching/AbstractStretchingScreen.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.support.stretching; +package com.refinedmods.refinedstorage.common.support.stretching; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage.platform.common.support.widget.ScrollbarWidget; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.common.support.widget.ScrollbarWidget; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/ScreenSize.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/stretching/ScreenSize.java similarity index 82% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/ScreenSize.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/stretching/ScreenSize.java index dded9afea..e4c5c9868 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/ScreenSize.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/stretching/ScreenSize.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.stretching; +package com.refinedmods.refinedstorage.common.support.stretching; public enum ScreenSize { STRETCH, diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/ScreenSizeListener.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/stretching/ScreenSizeListener.java similarity index 59% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/ScreenSizeListener.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/stretching/ScreenSizeListener.java index 94d7f2330..748a2002f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/ScreenSizeListener.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/stretching/ScreenSizeListener.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.stretching; +package com.refinedmods.refinedstorage.common.support.stretching; @FunctionalInterface public interface ScreenSizeListener { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/ScreenSizeSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/stretching/ScreenSizeSideButtonWidget.java similarity index 86% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/ScreenSizeSideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/stretching/ScreenSizeSideButtonWidget.java index 5d976b10c..dccbbeb9c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/ScreenSizeSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/stretching/ScreenSizeSideButtonWidget.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.support.stretching; +package com.refinedmods.refinedstorage.common.support.stretching; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.support.widget.AbstractSideButtonWidget; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class ScreenSizeSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "screen_size"); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/stretching/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/stretching/package-info.java new file mode 100644 index 000000000..cbecde1b3 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/stretching/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.support.stretching; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/CompositeClientTooltipComponent.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/CompositeClientTooltipComponent.java similarity index 95% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/CompositeClientTooltipComponent.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/CompositeClientTooltipComponent.java index 26b15e285..b1a2c7989 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/CompositeClientTooltipComponent.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/CompositeClientTooltipComponent.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.tooltip; +package com.refinedmods.refinedstorage.common.support.tooltip; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/HelpClientTooltipComponent.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/HelpClientTooltipComponent.java similarity index 91% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/HelpClientTooltipComponent.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/HelpClientTooltipComponent.java index 89df5f0c3..23cf658a8 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/HelpClientTooltipComponent.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/HelpClientTooltipComponent.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support.tooltip; +package com.refinedmods.refinedstorage.common.support.tooltip; -import com.refinedmods.refinedstorage.platform.common.support.TextureIds; +import com.refinedmods.refinedstorage.common.support.TextureIds; import java.util.List; @@ -15,7 +15,7 @@ import net.minecraft.util.FormattedCharSequence; import org.joml.Matrix4f; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslationAsHeading; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslationAsHeading; import static net.minecraft.client.gui.screens.Screen.hasShiftDown; public class HelpClientTooltipComponent implements ClientTooltipComponent { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/MouseClientTooltipComponent.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/MouseClientTooltipComponent.java similarity index 93% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/MouseClientTooltipComponent.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/MouseClientTooltipComponent.java index 5b376ec91..e22efeacd 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/MouseClientTooltipComponent.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/MouseClientTooltipComponent.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.support.tooltip; +package com.refinedmods.refinedstorage.common.support.tooltip; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.support.TextureIds; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.support.TextureIds; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/ResourceClientTooltipComponent.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/ResourceClientTooltipComponent.java similarity index 89% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/ResourceClientTooltipComponent.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/ResourceClientTooltipComponent.java index 253e36839..080868573 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/ResourceClientTooltipComponent.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/ResourceClientTooltipComponent.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.support.tooltip; +package com.refinedmods.refinedstorage.common.support.tooltip; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceRendering; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceRendering; import java.util.Objects; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/SmallText.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/SmallText.java similarity index 93% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/SmallText.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/SmallText.java index 38a77e65e..8d71dee69 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/SmallText.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/SmallText.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.tooltip; +package com.refinedmods.refinedstorage.common.support.tooltip; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/SmallTextClientTooltipComponent.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/SmallTextClientTooltipComponent.java similarity index 93% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/SmallTextClientTooltipComponent.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/SmallTextClientTooltipComponent.java index 0ac9934eb..20190dafb 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/SmallTextClientTooltipComponent.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/SmallTextClientTooltipComponent.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.tooltip; +package com.refinedmods.refinedstorage.common.support.tooltip; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/package-info.java new file mode 100644 index 000000000..573cd0b2e --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.support.tooltip; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/AbstractSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/AbstractSideButtonWidget.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/AbstractSideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/AbstractSideButtonWidget.java index c9706f073..b91358499 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/AbstractSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/AbstractSideButtonWidget.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.support.widget; +package com.refinedmods.refinedstorage.common.support.widget; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage.platform.common.support.TextureIds; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.HelpClientTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.SmallTextClientTooltipComponent; +import com.refinedmods.refinedstorage.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.common.support.TextureIds; +import com.refinedmods.refinedstorage.common.support.tooltip.HelpClientTooltipComponent; +import com.refinedmods.refinedstorage.common.support.tooltip.SmallTextClientTooltipComponent; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/AbstractYesNoSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/AbstractYesNoSideButtonWidget.java similarity index 71% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/AbstractYesNoSideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/AbstractYesNoSideButtonWidget.java index 3e7d4769b..8aa44b9be 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/AbstractYesNoSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/AbstractYesNoSideButtonWidget.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.support.widget; +package com.refinedmods.refinedstorage.common.support.widget; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.NO; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.YES; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.NO; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.YES; public abstract class AbstractYesNoSideButtonWidget extends AbstractSideButtonWidget { protected final ClientProperty property; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/CustomCheckboxWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/CustomCheckboxWidget.java similarity index 98% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/CustomCheckboxWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/CustomCheckboxWidget.java index e090114b7..aca5918a6 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/CustomCheckboxWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/CustomCheckboxWidget.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.widget; +package com.refinedmods.refinedstorage.common.support.widget; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/FuzzyModeSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/FuzzyModeSideButtonWidget.java similarity index 89% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/FuzzyModeSideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/FuzzyModeSideButtonWidget.java index 743439dbf..5beb1160e 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/FuzzyModeSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/FuzzyModeSideButtonWidget.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.common.support.widget; +package com.refinedmods.refinedstorage.common.support.widget; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; import java.util.function.Supplier; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class FuzzyModeSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "fuzzy_mode"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/History.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/History.java similarity index 93% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/History.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/History.java index 85251b476..5494b958d 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/History.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/History.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.widget; +package com.refinedmods.refinedstorage.common.support.widget; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/HoveredImageButton.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/HoveredImageButton.java similarity index 93% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/HoveredImageButton.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/HoveredImageButton.java index 269f03306..09fd5bdf1 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/HoveredImageButton.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/HoveredImageButton.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.widget; +package com.refinedmods.refinedstorage.common.support.widget; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.ImageButton; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/ProgressWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/ProgressWidget.java similarity index 91% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/ProgressWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/ProgressWidget.java index f471c70ed..8cf60a071 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/ProgressWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/ProgressWidget.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.widget; +package com.refinedmods.refinedstorage.common.support.widget; import java.util.List; import java.util.function.DoubleSupplier; @@ -11,7 +11,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public class ProgressWidget extends AbstractWidget { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/widgets.png"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/RedstoneModeSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/RedstoneModeSideButtonWidget.java similarity index 89% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/RedstoneModeSideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/RedstoneModeSideButtonWidget.java index eba1aa4b9..ebe96e777 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/RedstoneModeSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/RedstoneModeSideButtonWidget.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.common.support.widget; +package com.refinedmods.refinedstorage.common.support.widget; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; import javax.annotation.Nullable; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class RedstoneModeSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "redstone_mode"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/SchedulingModeSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/SchedulingModeSideButtonWidget.java similarity index 82% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/SchedulingModeSideButtonWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/SchedulingModeSideButtonWidget.java index b1cd2ab66..ae54ec655 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/SchedulingModeSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/SchedulingModeSideButtonWidget.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.common.support.widget; +package com.refinedmods.refinedstorage.common.support.widget; -import com.refinedmods.refinedstorage.platform.common.support.SchedulingModeType; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.SchedulingModeType; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class SchedulingModeSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "scheduling_mode"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/ScrollbarWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/ScrollbarWidget.java similarity index 96% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/ScrollbarWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/ScrollbarWidget.java index 5635167fa..7f0e34a89 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/ScrollbarWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/ScrollbarWidget.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support.widget; +package com.refinedmods.refinedstorage.common.support.widget; -import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.common.Platform; import java.util.function.DoubleConsumer; import javax.annotation.Nullable; @@ -11,7 +11,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public class ScrollbarWidget extends AbstractWidget { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/widgets.png"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/SearchFieldWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/SearchFieldWidget.java similarity index 94% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/SearchFieldWidget.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/SearchFieldWidget.java index bd6e2a501..fb9c50eb7 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/SearchFieldWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/SearchFieldWidget.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.support.widget; +package com.refinedmods.refinedstorage.common.support.widget; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.KeyMappings; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.content.KeyMappings; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.components.EditBox; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/package-info.java new file mode 100644 index 000000000..3f4db803b --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/widget/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.support.widget; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/FortuneUpgradeItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/FortuneUpgradeItem.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/FortuneUpgradeItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/FortuneUpgradeItem.java index f7a98270f..d90e709c6 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/FortuneUpgradeItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/FortuneUpgradeItem.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.upgrade; +package com.refinedmods.refinedstorage.common.upgrade; -import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage.platform.api.upgrade.AbstractUpgradeItem; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; -import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.common.api.upgrade.AbstractUpgradeItem; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeRegistry; import java.util.Optional; @@ -12,7 +12,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class FortuneUpgradeItem extends AbstractUpgradeItem { private static final Component HELP = createTranslation("item", "fortune_upgrade.help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RangeUpgradeItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/RangeUpgradeItem.java similarity index 71% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RangeUpgradeItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/RangeUpgradeItem.java index 335344563..f58a0e5a7 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RangeUpgradeItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/RangeUpgradeItem.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.upgrade; +package com.refinedmods.refinedstorage.common.upgrade; -import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage.platform.api.upgrade.AbstractUpgradeItem; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; -import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.common.api.upgrade.AbstractUpgradeItem; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeRegistry; import java.util.Optional; @@ -12,7 +12,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class RangeUpgradeItem extends AbstractUpgradeItem { private static final Component HELP = createTranslation("item", "range_upgrade.help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/RegulatorUpgradeContainerMenu.java similarity index 72% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/RegulatorUpgradeContainerMenu.java index a0a0feb62..046018399 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/RegulatorUpgradeContainerMenu.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.upgrade; +package com.refinedmods.refinedstorage.common.upgrade; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractSingleAmountContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.SingleAmountData; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.support.containermenu.AbstractSingleAmountContainerMenu; +import com.refinedmods.refinedstorage.common.support.containermenu.SingleAmountData; import java.util.function.Consumer; import javax.annotation.Nullable; @@ -13,7 +13,7 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class RegulatorUpgradeContainerMenu extends AbstractSingleAmountContainerMenu { private static final Component FILTER_HELP = createTranslation("gui", "regulator_upgrade.filter_help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/RegulatorUpgradeItem.java similarity index 83% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/RegulatorUpgradeItem.java index 3a7ba006e..845b6ff2b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/RegulatorUpgradeItem.java @@ -1,20 +1,20 @@ -package com.refinedmods.refinedstorage.platform.common.upgrade; +package com.refinedmods.refinedstorage.common.upgrade; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.api.upgrade.AbstractUpgradeItem; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.content.DataComponents; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ExtendedMenuProvider; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.SingleAmountData; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.api.upgrade.AbstractUpgradeItem; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeRegistry; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.content.DataComponents; +import com.refinedmods.refinedstorage.common.support.containermenu.ExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.support.containermenu.SingleAmountData; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; import java.util.Optional; import java.util.OptionalLong; @@ -35,7 +35,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class RegulatorUpgradeItem extends AbstractUpgradeItem { private static final Component HELP = createTranslation("item", "regulator_upgrade.help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/RegulatorUpgradeScreen.java similarity index 74% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/RegulatorUpgradeScreen.java index 4938bebb2..0a5af7083 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/RegulatorUpgradeScreen.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.upgrade; +package com.refinedmods.refinedstorage.common.upgrade; -import com.refinedmods.refinedstorage.platform.common.support.amount.AbstractSingleAmountScreen; +import com.refinedmods.refinedstorage.common.support.amount.AbstractSingleAmountScreen; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeState.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/RegulatorUpgradeState.java similarity index 86% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeState.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/RegulatorUpgradeState.java index 634877135..5e407fde2 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeState.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/RegulatorUpgradeState.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.upgrade; +package com.refinedmods.refinedstorage.common.upgrade; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.support.resource.ResourceCodecs; import java.util.Optional; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/SimpleUpgradeItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/SimpleUpgradeItem.java similarity index 80% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/SimpleUpgradeItem.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/SimpleUpgradeItem.java index dbfb81b64..cdf759fcd 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/SimpleUpgradeItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/SimpleUpgradeItem.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.upgrade; +package com.refinedmods.refinedstorage.common.upgrade; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage.platform.api.upgrade.AbstractUpgradeItem; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; -import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.common.api.upgrade.AbstractUpgradeItem; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeRegistry; import java.util.Optional; import java.util.function.LongSupplier; @@ -14,7 +14,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public final class SimpleUpgradeItem extends AbstractUpgradeItem { private final LongSupplier energyUsageResolver; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeContainer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeContainer.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeContainer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeContainer.java index 9d805c137..819b3dba8 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeContainer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeContainer.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.common.upgrade; +package com.refinedmods.refinedstorage.common.upgrade; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeDestination; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeItem; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeMapping; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeDestination; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeItem; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeMapping; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeRegistry; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeDestinationClientTooltipComponent.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeDestinationClientTooltipComponent.java similarity index 93% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeDestinationClientTooltipComponent.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeDestinationClientTooltipComponent.java index 9e80c74d3..1895b2dac 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeDestinationClientTooltipComponent.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeDestinationClientTooltipComponent.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.upgrade; +package com.refinedmods.refinedstorage.common.upgrade; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeMapping; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeMapping; import java.util.Objects; import java.util.Set; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeDestinations.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeDestinations.java similarity index 84% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeDestinations.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeDestinations.java index 1bec06e7c..8f8893a31 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeDestinations.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeDestinations.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.upgrade; +package com.refinedmods.refinedstorage.common.upgrade; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeDestination; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeDestination; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.content.Items; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeItemClientTooltipComponent.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeItemClientTooltipComponent.java similarity index 89% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeItemClientTooltipComponent.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeItemClientTooltipComponent.java index 20d1cfeac..737db9d77 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeItemClientTooltipComponent.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeItemClientTooltipComponent.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.upgrade; +package com.refinedmods.refinedstorage.common.upgrade; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeMapping; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeMapping; import java.util.Objects; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeRegistryImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeRegistryImpl.java similarity index 88% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeRegistryImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeRegistryImpl.java index 70c36641f..8ca809285 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeRegistryImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeRegistryImpl.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.upgrade; +package com.refinedmods.refinedstorage.common.upgrade; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeDestination; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeMapping; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeDestination; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeMapping; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeRegistry; import java.util.Collections; import java.util.HashMap; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeSlot.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeSlot.java similarity index 83% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeSlot.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeSlot.java index 173aea0bb..35cb2a5c2 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeSlot.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeSlot.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.upgrade; +package com.refinedmods.refinedstorage.common.upgrade; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeMapping; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeMapping; import java.util.Set; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeWithEnchantedBookRecipe.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeWithEnchantedBookRecipe.java similarity index 96% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeWithEnchantedBookRecipe.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeWithEnchantedBookRecipe.java index c20e64926..5a3fb4752 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeWithEnchantedBookRecipe.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeWithEnchantedBookRecipe.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.upgrade; +package com.refinedmods.refinedstorage.common.upgrade; -import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.common.content.Items; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeWithEnchantedBookRecipeSerializer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeWithEnchantedBookRecipeSerializer.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeWithEnchantedBookRecipeSerializer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeWithEnchantedBookRecipeSerializer.java index 8c77f7986..edf5ccb1b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeWithEnchantedBookRecipeSerializer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeWithEnchantedBookRecipeSerializer.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.upgrade; +package com.refinedmods.refinedstorage.common.upgrade; import com.mojang.serialization.MapCodec; import net.minecraft.network.RegistryFriendlyByteBuf; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/package-info.java new file mode 100644 index 000000000..06007a034 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.upgrade; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/ContainerUtil.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/ContainerUtil.java similarity index 96% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/ContainerUtil.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/ContainerUtil.java index 822d91892..6b57351d0 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/ContainerUtil.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/ContainerUtil.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.util; +package com.refinedmods.refinedstorage.common.util; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/CustomBlockPlaceContext.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/CustomBlockPlaceContext.java similarity index 92% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/CustomBlockPlaceContext.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/CustomBlockPlaceContext.java index c6181be73..90ca08ce4 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/CustomBlockPlaceContext.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/CustomBlockPlaceContext.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.util; +package com.refinedmods.refinedstorage.common.util; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/IdentifierUtil.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/IdentifierUtil.java similarity index 93% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/IdentifierUtil.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/IdentifierUtil.java index 16c23aff7..795d8e138 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/IdentifierUtil.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/IdentifierUtil.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.util; +package com.refinedmods.refinedstorage.common.util; -import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; +import com.refinedmods.refinedstorage.common.api.support.AmountFormatting; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/MathUtil.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/MathUtil.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/MathUtil.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/MathUtil.java index 6f1a8bceb..200af85b8 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/MathUtil.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/MathUtil.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.util; +package com.refinedmods.refinedstorage.common.util; public final class MathUtil { private MathUtil() { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/PacketUtil.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/PacketUtil.java similarity index 87% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/PacketUtil.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/PacketUtil.java index 3f053ec5e..286e4d22d 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/PacketUtil.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/PacketUtil.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.util; +package com.refinedmods.refinedstorage.common.util; import io.netty.buffer.ByteBuf; import net.minecraft.network.codec.ByteBufCodecs; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/SecurityToastUtil.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/SecurityToastUtil.java similarity index 79% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/SecurityToastUtil.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/SecurityToastUtil.java index 68d4f833c..a92ef1557 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/SecurityToastUtil.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/SecurityToastUtil.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.util; +package com.refinedmods.refinedstorage.common.util; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.toasts.SystemToast; import net.minecraft.network.chat.Component; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public final class SecurityToastUtil { private static final SystemToast.SystemToastId NO_PERMISSION_TOAST_ID = new SystemToast.SystemToastId(); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/ServerEventQueue.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/ServerEventQueue.java similarity index 90% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/ServerEventQueue.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/ServerEventQueue.java index 7f4cb03cf..10d8f625f 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/ServerEventQueue.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/ServerEventQueue.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.util; +package com.refinedmods.refinedstorage.common.util; import java.util.ArrayDeque; import java.util.Deque; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/package-info.java new file mode 100644 index 000000000..e27916796 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/util/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.common.util; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/BaseWirelessTransmitterRangeModifier.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/BaseWirelessTransmitterRangeModifier.java new file mode 100644 index 000000000..76b6cc3a4 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/BaseWirelessTransmitterRangeModifier.java @@ -0,0 +1,12 @@ +package com.refinedmods.refinedstorage.common.wirelesstransmitter; + +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.common.api.wirelesstransmitter.WirelessTransmitterRangeModifier; + +public class BaseWirelessTransmitterRangeModifier implements WirelessTransmitterRangeModifier { + @Override + public int modifyRange(final UpgradeState upgradeState, final int range) { + return Platform.INSTANCE.getConfig().getWirelessTransmitter().getBaseRange() + range; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/CompositeWirelessTransmitterRangeModifier.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/CompositeWirelessTransmitterRangeModifier.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/CompositeWirelessTransmitterRangeModifier.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/CompositeWirelessTransmitterRangeModifier.java index ec97eb5fa..1ac68976c 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/CompositeWirelessTransmitterRangeModifier.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/CompositeWirelessTransmitterRangeModifier.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; +package com.refinedmods.refinedstorage.common.wirelesstransmitter; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.common.api.wirelesstransmitter.WirelessTransmitterRangeModifier; import java.util.Comparator; import java.util.PriorityQueue; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/CreativeRangeUpgradeWirelessTransmitterRangeModifier.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/CreativeRangeUpgradeWirelessTransmitterRangeModifier.java similarity index 57% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/CreativeRangeUpgradeWirelessTransmitterRangeModifier.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/CreativeRangeUpgradeWirelessTransmitterRangeModifier.java index baf975b88..5c1e8e8b7 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/CreativeRangeUpgradeWirelessTransmitterRangeModifier.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/CreativeRangeUpgradeWirelessTransmitterRangeModifier.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; +package com.refinedmods.refinedstorage.common.wirelesstransmitter; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; -import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.common.api.wirelesstransmitter.WirelessTransmitterRangeModifier; +import com.refinedmods.refinedstorage.common.content.Items; public class CreativeRangeUpgradeWirelessTransmitterRangeModifier implements WirelessTransmitterRangeModifier { @Override diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/RangeUpgradeWirelessTransmitterRangeModifier.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/RangeUpgradeWirelessTransmitterRangeModifier.java similarity index 55% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/RangeUpgradeWirelessTransmitterRangeModifier.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/RangeUpgradeWirelessTransmitterRangeModifier.java index 5d10ac039..cf18efaaa 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/RangeUpgradeWirelessTransmitterRangeModifier.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/RangeUpgradeWirelessTransmitterRangeModifier.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; +package com.refinedmods.refinedstorage.common.wirelesstransmitter; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.common.api.wirelesstransmitter.WirelessTransmitterRangeModifier; +import com.refinedmods.refinedstorage.common.content.Items; public class RangeUpgradeWirelessTransmitterRangeModifier implements WirelessTransmitterRangeModifier { @Override diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterBlock.java similarity index 75% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterBlock.java index 908ef036c..30603c483 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterBlock.java @@ -1,17 +1,17 @@ -package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; +package com.refinedmods.refinedstorage.common.wirelesstransmitter; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.support.AbstractActiveColoredDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage.platform.common.support.direction.DefaultDirectionType; -import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; -import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.BlockConstants; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.support.AbstractActiveColoredDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.common.support.direction.DefaultDirectionType; +import com.refinedmods.refinedstorage.common.support.direction.DirectionType; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker; import javax.annotation.Nullable; @@ -31,7 +31,7 @@ import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class WirelessTransmitterBlock extends AbstractActiveColoredDirectionalBlock diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java similarity index 80% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java index 873ff63f1..c33370440 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java @@ -1,19 +1,19 @@ -package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; +package com.refinedmods.refinedstorage.common.wirelesstransmitter; import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionSink; -import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.BlockEntityWithDrops; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; -import com.refinedmods.refinedstorage.platform.common.util.ContainerUtil; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.BlockEntityWithDrops; +import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.common.util.ContainerUtil; import java.util.List; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java similarity index 75% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java index e96ddf832..19a028469 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; +package com.refinedmods.refinedstorage.common.wirelesstransmitter; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.common.content.Menus; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseContainerMenu; -import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.S2CPackets; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeSlot; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.content.Menus; +import com.refinedmods.refinedstorage.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.common.support.packet.s2c.S2CPackets; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeSlot; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterData.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterData.java similarity index 85% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterData.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterData.java index 8fc7e5aad..a0e60942b 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterData.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterData.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; +package com.refinedmods.refinedstorage.common.wirelesstransmitter; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java similarity index 81% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java index 596d66651..60ade3c61 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; +package com.refinedmods.refinedstorage.common.wirelesstransmitter; import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionLogic; -import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitter; -import com.refinedmods.refinedstorage.platform.common.support.network.InWorldNetworkNodeContainerImpl; +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionLogic; +import com.refinedmods.refinedstorage.common.api.wirelesstransmitter.WirelessTransmitter; +import com.refinedmods.refinedstorage.common.support.network.InWorldNetworkNodeContainerImpl; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceKey; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterScreen.java similarity index 72% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterScreen.java index 63fef0c3f..85ba735f4 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterScreen.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; +package com.refinedmods.refinedstorage.common.wirelesstransmitter; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage.platform.common.support.widget.RedstoneModeSideButtonWidget; +import com.refinedmods.refinedstorage.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.common.support.widget.RedstoneModeSideButtonWidget; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class WirelessTransmitterScreen extends AbstractBaseScreen { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/wireless_transmitter.png"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/package-info.java similarity index 76% rename from refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/package-info.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/package-info.java index 23195fa3e..dff267fde 100644 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/package-info.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.controller; +package com.refinedmods.refinedstorage.common.wirelesstransmitter; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/1024b_fluid_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/1024b_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/1024b_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/1024b_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/16k_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/16k_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/16k_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/16k_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/1k_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/1k_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/1k_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/1k_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/256b_fluid_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/256b_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/256b_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/256b_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/4096b_fluid_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/4096b_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/4096b_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/4096b_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/4k_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/4k_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/4k_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/4k_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/64b_fluid_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/64b_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/64b_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/64b_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/64k_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/64k_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/64k_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/64k_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/creative_fluid_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/creative_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/creative_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/creative_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/creative_portable_grid.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/creative_portable_grid.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/creative_portable_grid.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/creative_portable_grid.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/creative_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/creative_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/creative_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/creative_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/interface.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/interface.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/interface.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/interface.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/portable_grid.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/portable_grid.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/portable_grid.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/portable_grid.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_copper_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_copper_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_copper_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_copper_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_iron_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_iron_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_iron_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_iron_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/icon.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/icon.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/icon.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/icon.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/de_de.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/de_de.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/de_de.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/lang/de_de.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/en_us.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/en_us.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/en_us.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/lang/en_us.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/es_es.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/es_es.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/es_es.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/lang/es_es.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/fr_fr.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/fr_fr.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/fr_fr.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/lang/fr_fr.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/hu_hu.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/hu_hu.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/hu_hu.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/lang/hu_hu.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/id_id.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/id_id.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/id_id.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/lang/id_id.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/it_it.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/it_it.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/it_it.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/lang/it_it.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ja_jp.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/ja_jp.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ja_jp.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/lang/ja_jp.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ko_kr.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/ko_kr.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ko_kr.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/lang/ko_kr.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/pl_pl.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/pl_pl.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/pl_pl.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/lang/pl_pl.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/pt_br.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/pt_br.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/pt_br.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/lang/pt_br.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ru_ru.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/ru_ru.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ru_ru.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/lang/ru_ru.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/tr_tr.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/tr_tr.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/tr_tr.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/lang/tr_tr.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/zh_cn.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/zh_cn.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/zh_cn.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/lang/zh_cn.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/zh_tw.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/zh_tw.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/zh_tw.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/lang/zh_tw.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/1024b_fluid_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/1024b_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/1024b_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/1024b_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/16k_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/16k_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/16k_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/16k_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/1k_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/1k_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/1k_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/1k_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/256b_fluid_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/256b_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/256b_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/256b_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/4096b_fluid_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/4096b_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/4096b_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/4096b_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/4k_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/4k_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/4k_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/4k_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/64b_fluid_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/64b_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/64b_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/64b_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/64k_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/64k_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/64k_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/64k_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/all_cutout.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/all_cutout.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/all_cutout.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/all_cutout.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/cable/core/base.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/cable/core/base.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/cable/core/base.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/cable/core/base.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/cable/extension/base.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/cable/extension/base.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/cable/extension/base.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/cable/extension/base.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor/active.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/constructor/active.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor/active.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/constructor/active.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor/inactive.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/constructor/inactive.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor/inactive.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/constructor/inactive.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor_destructor/active.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/constructor_destructor/active.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor_destructor/active.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/constructor_destructor/active.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor_destructor/inactive.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/constructor_destructor/inactive.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor_destructor/inactive.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/constructor_destructor/inactive.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly_off.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly_off.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly_off.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly_off.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly_on.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly_on.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly_on.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly_on.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/off.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/controller/off.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/off.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/controller/off.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/creative_fluid_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/creative_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/creative_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/creative_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/creative_portable_grid.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/creative_portable_grid.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/creative_portable_grid.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/creative_portable_grid.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/creative_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/creative_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/creative_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/creative_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/cutout.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/cutout.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/cutout.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/cutout.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/destructor/active.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/destructor/active.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/destructor/active.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/destructor/active.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/destructor/inactive.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/destructor/inactive.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/destructor/inactive.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/destructor/inactive.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/detector/powered.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/detector/powered.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/detector/powered.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/detector/powered.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/detector/unpowered.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/detector/unpowered.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/detector/unpowered.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/detector/unpowered.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/disk.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/disk/disk.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/disk.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/disk/disk.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/fluid_disk.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/disk/fluid_disk.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/fluid_disk.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/disk/fluid_disk.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_full.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/disk/led_full.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_full.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/disk/led_full.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_inactive.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/disk/led_inactive.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_inactive.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/disk/led_inactive.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_near_capacity.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/disk/led_near_capacity.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_near_capacity.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/disk/led_near_capacity.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_normal.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/disk/led_normal.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_normal.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/disk/led_normal.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk_drive.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/disk_drive.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk_drive.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/disk_drive.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk_drive/base.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/disk_drive/base.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk_drive/base.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/disk_drive/base.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/emissive_all_cutout.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/emissive_all_cutout.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/emissive_all_cutout.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/emissive_all_cutout.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/emissive_cutout.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/emissive_cutout.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/emissive_cutout.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/emissive_cutout.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/emissive_north_cutout.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/emissive_north_cutout.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/emissive_north_cutout.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/emissive_north_cutout.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/exporter.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/exporter.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/exporter.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/exporter.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/external_storage.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/external_storage.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/external_storage.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/importer.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/importer.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/importer.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/importer.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/interface_active.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/interface_active.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/interface_active.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/interface_active.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/interface_inactive.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/interface_inactive.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/interface_inactive.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/interface_inactive.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/machine_casing.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/machine_casing.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/machine_casing.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/machine_casing.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/north_cutout.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/north_cutout.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/north_cutout.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/north_cutout.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/portable_grid.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/portable_grid.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/active.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/active.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/active.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/active.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/base.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/base.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/base.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/base.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/inactive.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/inactive.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/inactive.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/inactive.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_copper_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_copper_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_copper_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_copper_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_iron_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_iron_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_iron_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_iron_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/storage_monitor.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/storage_monitor.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/storage_monitor.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/storage_monitor.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter/active.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter/active.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter/active.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter/active.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter/inactive.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter/inactive.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter/inactive.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter/inactive.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_disk.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_disk.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_disk.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_disk.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_part.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_part.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_part.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_part.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_disk.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_disk.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_disk.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_disk.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_part.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_part.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_part.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_part.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_disk.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_disk.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_disk.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_disk.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_part.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_part.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_part.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_part.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_disk.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_disk.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_disk.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_disk.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_part.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_part.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_part.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_part.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/basic_processor.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/basic_processor.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/basic_processor.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/basic_processor.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/book.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/book.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/book.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/book.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/cable/base.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/cable/base.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/cable/base.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/cable/base.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/configuration_card.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/configuration_card.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/configuration_card.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/configuration_card.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/configuration_card/active.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/configuration_card/active.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/configuration_card/active.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/configuration_card/active.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/configuration_card/inactive.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/configuration_card/inactive.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/configuration_card/inactive.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/configuration_card/inactive.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/construction_core.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/construction_core.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/construction_core.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/construction_core.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/constructor/base.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/constructor/base.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/constructor/base.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/constructor/base.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_disk.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_disk.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_disk.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_disk.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_portable_grid.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/creative_portable_grid.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_portable_grid.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/creative_portable_grid.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_range_upgrade.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/creative_range_upgrade.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_range_upgrade.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/creative_range_upgrade.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_storage_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/creative_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_storage_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/creative_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_wireless_grid.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/creative_wireless_grid.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_wireless_grid.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/creative_wireless_grid.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/destruction_core.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/destruction_core.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/destruction_core.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/destruction_core.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/destructor/base.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/destructor/base.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/destructor/base.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/destructor/base.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/disk_drive.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/disk_drive.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/disk_drive.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/disk_drive.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/exporter/base.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/exporter/base.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/exporter/base.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/exporter/base.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/external_storage/base.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/external_storage/base.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/external_storage/base.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/external_storage/base.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fallback_security_card.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/fallback_security_card.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fallback_security_card.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/fallback_security_card.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fortune_1_upgrade.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/fortune_1_upgrade.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fortune_1_upgrade.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/fortune_1_upgrade.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fortune_2_upgrade.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/fortune_2_upgrade.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fortune_2_upgrade.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/fortune_2_upgrade.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fortune_3_upgrade.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/fortune_3_upgrade.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fortune_3_upgrade.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/fortune_3_upgrade.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/importer/base.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/importer/base.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/importer/base.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/importer/base.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/improved_processor.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/improved_processor.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/improved_processor.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/improved_processor.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/interface.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/interface.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/interface.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/interface.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/machine_casing.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/machine_casing.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/machine_casing.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/machine_casing.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/network_card.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/network_card.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/network_card.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/network_card.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/network_card/active.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/network_card/active.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/network_card/active.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/network_card/active.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/network_card/inactive.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/network_card/inactive.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/network_card/inactive.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/network_card/inactive.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/portable_grid.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/portable_grid.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/portable_grid.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/portable_grid.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/processor_binding.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/processor_binding.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/processor_binding.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/processor_binding.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron_block.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron_block.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron_block.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/range_upgrade.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/range_upgrade.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/range_upgrade.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/range_upgrade.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/raw_advanced_processor.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/raw_advanced_processor.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/raw_advanced_processor.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/raw_advanced_processor.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/raw_basic_processor.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/raw_basic_processor.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/raw_basic_processor.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/raw_basic_processor.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/raw_improved_processor.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/raw_improved_processor.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/raw_improved_processor.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/raw_improved_processor.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/regulator_upgrade.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/regulator_upgrade.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/regulator_upgrade.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/regulator_upgrade.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/security_card.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/security_card.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/security_card.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/security_card.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/security_card/active.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/security_card/active.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/security_card/active.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/security_card/active.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/security_card/inactive.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/security_card/inactive.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/security_card/inactive.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/security_card/inactive.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/silicon.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/silicon.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/silicon.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/silicon.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/silk_touch_upgrade.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/silk_touch_upgrade.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/silk_touch_upgrade.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/silk_touch_upgrade.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/speed_upgrade.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/speed_upgrade.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/speed_upgrade.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/speed_upgrade.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/stack_upgrade.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/stack_upgrade.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/stack_upgrade.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/stack_upgrade.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/storage_housing.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/storage_housing.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/storage_housing.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/storage_housing.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/storage_monitor.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/storage_monitor.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/storage_monitor.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/storage_monitor.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/upgrade.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/upgrade.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/upgrade.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/upgrade.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid/active.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid/active.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid/active.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid/active.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid/inactive.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid/inactive.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid/inactive.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid/inactive.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wrench.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/wrench.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wrench.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/models/item/wrench.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/sounds.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/sounds.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/sounds.json rename to refinedstorage-common/src/main/resources/assets/refinedstorage/sounds.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/sounds/wrench.ogg b/refinedstorage-common/src/main/resources/assets/refinedstorage/sounds/wrench.ogg similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/sounds/wrench.ogg rename to refinedstorage-common/src/main/resources/assets/refinedstorage/sounds/wrench.ogg diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/bottom.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/bottom.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/bottom.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/bottom.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/black.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/black.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/black.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/black.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/brown.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/brown.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/brown.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/brown.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/cyan.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/cyan.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/cyan.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/cyan.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/green.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/green.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/green.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/green.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/light_blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/light_blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/light_blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/light_blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/light_gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/light_gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/light_gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/light_gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/lime.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/lime.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/lime.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/lime.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/magenta.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/magenta.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/magenta.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/magenta.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/orange.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/orange.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/orange.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/orange.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/part_border.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/part_border.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/part_border.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/part_border.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/pink.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/pink.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/pink.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/pink.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/purple.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/purple.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/purple.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/purple.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/red.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/red.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/red.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/red.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/white.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/white.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/white.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/white.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/yellow.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/yellow.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/yellow.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/cable/yellow.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/active.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/active.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/active.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/active.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/active.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/active.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/active.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/active.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/constructor/front.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/constructor/front.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/constructor/front.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/constructor/front.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/black.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/black.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/black.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/black.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/black.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/black.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/black.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/black.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/blue.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/blue.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/blue.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/blue.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/brown.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/brown.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/brown.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/brown.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/brown.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/brown.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/brown.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/brown.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/cyan.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/cyan.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/cyan.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/cyan.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/cyan.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/cyan.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/cyan.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/cyan.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/gray.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/gray.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/gray.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/gray.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/green.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/green.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/green.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/green.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/green.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/green.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/green.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/green.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_blue.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_blue.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_blue.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_blue.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_gray.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_gray.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_gray.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_gray.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/lime.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/lime.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/lime.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/lime.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/lime.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/lime.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/lime.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/lime.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/magenta.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/magenta.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/magenta.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/magenta.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/magenta.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/magenta.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/magenta.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/magenta.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off_gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off_gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off_gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off_gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off_gray.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off_gray.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off_gray.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off_gray.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on_gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on_gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on_gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on_gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on_gray.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on_gray.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on_gray.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on_gray.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/off.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/off.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/off.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/off.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/on.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/on.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/on.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/on.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/orange.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/orange.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/orange.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/orange.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/orange.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/orange.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/orange.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/orange.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/pink.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/pink.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/pink.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/pink.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/pink.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/pink.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/pink.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/pink.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/purple.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/purple.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/purple.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/purple.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/purple.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/purple.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/purple.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/purple.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/red.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/red.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/red.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/red.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/red.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/red.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/red.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/red.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/white.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/white.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/white.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/white.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/white.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/white.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/white.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/white.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/yellow.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/yellow.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/yellow.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/yellow.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/yellow.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/yellow.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/yellow.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/yellow.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/off.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/off.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/off.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/off.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/on.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/on.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/on.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/controller/on.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/back.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/back.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/back.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/back.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/black.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/black.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/black.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/black.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/brown.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/brown.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/brown.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/brown.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/cyan.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/cyan.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/cyan.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/cyan.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/green.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/green.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/green.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/green.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/light_blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/light_blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/light_blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/light_blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/light_gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/light_gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/light_gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/light_gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/lime.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/lime.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/lime.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/lime.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/magenta.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/magenta.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/magenta.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/magenta.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/orange.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/orange.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/orange.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/orange.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/pink.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/pink.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/pink.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/pink.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/purple.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/purple.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/purple.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/purple.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/red.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/red.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/red.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/red.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/white.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/white.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/white.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/white.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/yellow.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/yellow.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/yellow.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/yellow.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/front.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/front.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/front.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/front.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/left.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/left.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/left.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/left.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/right.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/right.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/right.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/right.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/top.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/top.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/top.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/top.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/active.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/active.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/active.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/active.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/active.png.mcmeta b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/active.png.mcmeta similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/active.png.mcmeta rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/active.png.mcmeta diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/destructor/front.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/destructor/front.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/destructor/front.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/destructor/front.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/bottom.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/bottom.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/bottom.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/bottom.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/black.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/black.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/black.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/black.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/brown.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/brown.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/brown.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/brown.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/cyan.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/cyan.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/cyan.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/cyan.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/green.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/green.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/green.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/green.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/light_blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/light_blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/light_blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/light_blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/light_gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/light_gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/light_gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/light_gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/lime.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/lime.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/lime.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/lime.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/magenta.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/magenta.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/magenta.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/magenta.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/orange.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/orange.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/orange.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/orange.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/pink.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/pink.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/pink.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/pink.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/purple.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/purple.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/purple.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/purple.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/red.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/red.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/red.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/red.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/unpowered.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/unpowered.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/unpowered.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/unpowered.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/white.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/white.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/white.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/white.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/yellow.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/yellow.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/yellow.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/yellow.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/side.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/side.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/side.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/side.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/top.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/top.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/top.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/detector/top.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk/disk.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk/disk.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk/disk.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk/disk.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk/fluid_disk.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk/fluid_disk.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk/fluid_disk.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk/fluid_disk.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk/leds.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk/leds.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk/leds.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk/leds.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/bottom.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/bottom.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/bottom.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/bottom.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/front.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/front.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/front.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/front.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/side.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/side.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/side.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/side.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/top.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/top.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/top.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/top.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/back.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/back.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/back.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/back.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/black.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/black.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/black.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/black.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/brown.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/brown.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/brown.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/brown.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/cyan.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/cyan.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/cyan.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/cyan.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/green.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/green.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/green.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/green.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/light_blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/light_blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/light_blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/light_blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/light_gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/light_gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/light_gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/light_gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/lime.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/lime.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/lime.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/lime.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/magenta.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/magenta.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/magenta.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/magenta.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/orange.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/orange.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/orange.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/orange.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/pink.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/pink.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/pink.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/pink.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/purple.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/purple.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/purple.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/purple.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/red.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/red.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/red.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/red.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/white.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/white.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/white.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/white.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/yellow.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/yellow.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/yellow.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/yellow.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/front.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/front.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/front.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/front.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/left.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/left.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/left.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/left.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/right.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/right.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/right.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/right.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/top.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/top.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/top.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/top.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/1024b_fluid_storage_block.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/1024b_fluid_storage_block.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/1024b_fluid_storage_block.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/1024b_fluid_storage_block.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/256b_fluid_storage_block.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/256b_fluid_storage_block.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/256b_fluid_storage_block.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/256b_fluid_storage_block.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/4096b_fluid_storage_block.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/4096b_fluid_storage_block.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/4096b_fluid_storage_block.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/4096b_fluid_storage_block.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/64b_fluid_storage_block.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/64b_fluid_storage_block.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/64b_fluid_storage_block.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/64b_fluid_storage_block.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/creative_fluid_storage_block.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/creative_fluid_storage_block.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/creative_fluid_storage_block.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/creative_fluid_storage_block.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/back.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/back.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/back.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/back.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/black.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/black.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/black.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/black.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/brown.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/brown.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/brown.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/brown.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/cyan.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/cyan.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/cyan.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/cyan.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/green.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/green.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/green.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/green.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/light_blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/light_blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/light_blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/light_blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/light_gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/light_gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/light_gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/light_gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/lime.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/lime.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/lime.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/lime.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/magenta.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/magenta.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/magenta.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/magenta.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/orange.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/orange.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/orange.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/orange.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/pink.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/pink.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/pink.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/pink.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/purple.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/purple.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/purple.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/purple.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/red.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/red.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/red.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/red.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/white.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/white.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/white.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/white.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/yellow.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/yellow.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/yellow.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/yellow.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/front.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/front.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/front.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/front.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/left.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/left.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/left.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/left.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/right.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/right.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/right.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/right.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/top.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/top.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/top.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/grid/top.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/interface/active.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/interface/active.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/interface/active.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/interface/active.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/interface/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/interface/inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/interface/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/interface/inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/machine_casing.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/machine_casing.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/machine_casing.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/machine_casing.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/base.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/base.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/base.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/base.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/black.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/black.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/black.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/black.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/brown.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/brown.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/brown.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/brown.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/cyan.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/cyan.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/cyan.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/cyan.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/green.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/green.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/green.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/green.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/light_blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/light_blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/light_blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/light_blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/light_gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/light_gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/light_gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/light_gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/lime.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/lime.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/lime.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/lime.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/magenta.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/magenta.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/magenta.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/magenta.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/orange.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/orange.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/orange.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/orange.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/pink.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/pink.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/pink.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/pink.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/purple.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/purple.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/purple.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/purple.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/red.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/red.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/red.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/red.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/white.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/white.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/white.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/white.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/yellow.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/yellow.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/yellow.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/yellow.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/base.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/base.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/base.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/base.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/black.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/black.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/black.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/black.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/brown.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/brown.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/brown.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/brown.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/cyan.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/cyan.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/cyan.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/cyan.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/error.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/error.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/error.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/error.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/green.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/green.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/green.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/green.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/light_blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/light_blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/light_blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/light_blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/light_gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/light_gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/light_gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/light_gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/lime.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/lime.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/lime.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/lime.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/magenta.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/magenta.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/magenta.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/magenta.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/orange.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/orange.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/orange.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/orange.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/pink.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/pink.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/pink.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/pink.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/purple.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/purple.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/purple.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/purple.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/red.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/red.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/red.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/red.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/white.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/white.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/white.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/white.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/yellow.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/yellow.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/yellow.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/yellow.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_1.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_1.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_1.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_1.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_2.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_2.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_2.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_2.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_2_inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_2_inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_2_inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_2_inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_3.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_3.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_3.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_3.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_4.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_4.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_4.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_4.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_5.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_5.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_5.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_5.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_6.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_6.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_6.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_6.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_7.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_7.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_7.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_7.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_8.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_8.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_8.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_8.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/quartz_enriched_copper_block.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/quartz_enriched_copper_block.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/quartz_enriched_copper_block.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/quartz_enriched_copper_block.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/quartz_enriched_iron_block.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/quartz_enriched_iron_block.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/quartz_enriched_iron_block.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/quartz_enriched_iron_block.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/.gitignore b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/.gitignore similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/.gitignore rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/.gitignore diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/black.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/black.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/black.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/black.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/brown.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/brown.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/brown.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/brown.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/cyan.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/cyan.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/cyan.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/cyan.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/green.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/green.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/green.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/green.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/light_blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/light_blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/light_blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/light_blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/light_gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/light_gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/light_gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/light_gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/lime.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/lime.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/lime.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/lime.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/magenta.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/magenta.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/magenta.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/magenta.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/orange.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/orange.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/orange.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/orange.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/pink.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/pink.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/pink.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/pink.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/purple.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/purple.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/purple.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/purple.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/red.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/red.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/red.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/red.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/white.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/white.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/white.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/white.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/yellow.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/yellow.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/yellow.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/yellow.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/black.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/black.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/black.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/black.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/brown.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/brown.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/brown.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/brown.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/cyan.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/cyan.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/cyan.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/cyan.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/green.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/green.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/green.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/green.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/light_blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/light_blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/light_blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/light_blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/light_gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/light_gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/light_gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/light_gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/lime.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/lime.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/lime.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/lime.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/magenta.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/magenta.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/magenta.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/magenta.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/orange.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/orange.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/orange.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/orange.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/pink.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/pink.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/pink.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/pink.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/purple.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/purple.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/purple.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/purple.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/red.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/red.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/red.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/red.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/white.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/white.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/white.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/white.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/yellow.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/yellow.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/yellow.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/out/yellow.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/in.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/in.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/in.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/in.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/out.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/out.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/out.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/relay/out.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/back.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/back.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/back.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/back.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/black.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/black.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/black.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/black.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/brown.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/brown.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/brown.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/brown.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/cyan.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/cyan.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/cyan.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/cyan.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/green.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/green.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/green.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/green.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/light_blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/light_blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/light_blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/light_blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/light_gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/light_gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/light_gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/light_gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/lime.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/lime.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/lime.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/lime.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/magenta.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/magenta.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/magenta.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/magenta.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/orange.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/orange.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/orange.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/orange.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/pink.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/pink.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/pink.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/pink.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/purple.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/purple.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/purple.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/purple.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/red.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/red.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/red.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/red.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/white.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/white.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/white.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/white.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/yellow.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/yellow.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/yellow.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/yellow.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/black.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/black.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/black.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/black.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/brown.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/brown.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/brown.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/brown.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/cyan.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/cyan.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/cyan.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/cyan.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/green.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/green.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/green.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/green.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/light_blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/light_blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/light_blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/light_blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/light_gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/light_gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/light_gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/light_gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/lime.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/lime.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/lime.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/lime.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/magenta.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/magenta.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/magenta.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/magenta.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/orange.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/orange.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/orange.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/orange.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/pink.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/pink.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/pink.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/pink.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/purple.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/purple.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/purple.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/purple.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/red.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/red.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/red.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/red.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/white.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/white.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/white.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/white.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/yellow.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/yellow.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/yellow.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/yellow.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/black.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/black.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/black.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/black.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/brown.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/brown.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/brown.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/brown.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/cyan.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/cyan.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/cyan.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/cyan.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/green.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/green.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/green.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/green.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/light_blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/light_blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/light_blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/light_blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/light_gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/light_gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/light_gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/light_gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/lime.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/lime.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/lime.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/lime.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/magenta.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/magenta.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/magenta.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/magenta.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/orange.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/orange.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/orange.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/orange.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/pink.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/pink.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/pink.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/pink.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/purple.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/purple.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/purple.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/purple.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/red.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/red.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/red.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/red.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/white.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/white.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/white.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/white.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/yellow.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/yellow.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/yellow.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/yellow.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/black.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/black.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/black.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/black.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/brown.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/brown.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/brown.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/brown.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/cyan.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/cyan.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/cyan.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/cyan.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/green.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/green.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/green.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/green.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/light_blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/light_blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/light_blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/light_blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/light_gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/light_gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/light_gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/light_gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/lime.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/lime.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/lime.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/lime.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/magenta.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/magenta.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/magenta.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/magenta.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/orange.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/orange.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/orange.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/orange.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/pink.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/pink.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/pink.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/pink.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/purple.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/purple.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/purple.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/purple.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/red.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/red.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/red.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/red.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/white.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/white.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/white.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/white.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/yellow.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/yellow.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/yellow.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/yellow.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/black.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/black.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/black.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/black.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/brown.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/brown.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/brown.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/brown.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/cyan.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/cyan.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/cyan.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/cyan.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/green.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/green.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/green.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/green.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/light_blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/light_blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/light_blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/light_blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/light_gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/light_gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/light_gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/light_gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/lime.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/lime.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/lime.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/lime.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/magenta.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/magenta.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/magenta.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/magenta.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/orange.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/orange.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/orange.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/orange.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/pink.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/pink.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/pink.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/pink.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/purple.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/purple.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/purple.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/purple.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/red.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/red.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/red.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/red.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/white.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/white.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/white.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/white.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/yellow.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/yellow.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/yellow.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/yellow.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/front.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/front.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/front.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/front.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/left.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/left.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/left.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/left.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/right.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/right.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/right.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/right.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/top.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/top.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/top.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/top.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/side.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/side.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/side.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/side.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/16k_storage_block.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/16k_storage_block.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/16k_storage_block.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/16k_storage_block.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/1k_storage_block.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/1k_storage_block.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/1k_storage_block.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/1k_storage_block.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/4k_storage_block.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/4k_storage_block.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/4k_storage_block.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/4k_storage_block.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/64k_storage_block.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/64k_storage_block.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/64k_storage_block.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/64k_storage_block.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/creative_storage_block.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/creative_storage_block.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/creative_storage_block.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/creative_storage_block.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/back.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/back.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/back.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/back.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/front.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/front.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/front.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/front.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/left.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/left.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/left.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/left.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/right.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/right.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/right.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/right.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/top.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/top.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/top.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/top.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/base.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/base.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/base.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/base.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/black.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/black.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/black.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/black.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/brown.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/brown.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/brown.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/brown.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/cyan.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/cyan.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/cyan.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/cyan.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/green.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/green.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/green.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/green.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/light_blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/light_blue.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/light_blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/light_blue.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/light_gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/light_gray.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/light_gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/light_gray.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/lime.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/lime.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/lime.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/lime.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/magenta.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/magenta.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/magenta.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/magenta.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/orange.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/orange.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/orange.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/orange.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/pink.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/pink.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/pink.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/pink.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/purple.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/purple.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/purple.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/purple.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/red.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/red.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/red.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/red.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/white.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/white.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/white.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/white.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/yellow.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/yellow.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/yellow.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/yellow.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/advancements.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/advancements.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/advancements.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/advancements.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/amount_with_inventory.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/amount_with_inventory.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/amount_with_inventory.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/amount_with_inventory.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/book.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/book.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/book.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/book.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/controller.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/controller.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/controller.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/controller.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/crafting.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/crafting.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/crafting.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/crafting.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/crafting_grid.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/crafting_grid.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/crafting_grid.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/crafting_grid.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/disk_drive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/disk_drive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/disk_drive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/disk_drive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/disk_interface.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/disk_interface.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/disk_interface.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/disk_interface.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/generic_filter.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/generic_filter.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/generic_filter.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/generic_filter.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/grid.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/grid.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/grid.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/grid.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/interface.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/interface.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/interface.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/interface.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/network_transmitter.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/network_transmitter.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/network_transmitter.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/network_transmitter.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/portable_grid.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/portable_grid.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/portable_grid.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/portable_grid.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/priority.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/priority.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/priority.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/priority.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/resource_amount.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/resource_amount.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/resource_amount.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/resource_amount.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/security_card.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/security_card.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/security_card.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/security_card.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/security_manager.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/security_manager.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/security_manager.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/security_manager.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down_disabled.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down_disabled.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down_disabled.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down_disabled.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down_focused.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down_focused.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down_focused.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down_focused.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up_disabled.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up_disabled.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up_disabled.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up_disabled.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up_focused.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up_focused.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up_focused.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up_focused.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/storage.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/storage.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/storage.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/storage.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/storage_monitor.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/storage_monitor.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/storage_monitor.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/storage_monitor.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/widgets.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/widgets.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/widgets.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/widgets.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/icons.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/icons.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/icons.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/icons.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/1024b_fluid_storage_disk.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/1024b_fluid_storage_disk.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/1024b_fluid_storage_disk.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/1024b_fluid_storage_disk.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/1024b_fluid_storage_part.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/1024b_fluid_storage_part.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/1024b_fluid_storage_part.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/1024b_fluid_storage_part.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/16k_storage_disk.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/16k_storage_disk.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/16k_storage_disk.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/16k_storage_disk.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/16k_storage_part.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/16k_storage_part.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/16k_storage_part.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/16k_storage_part.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/1k_storage_disk.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/1k_storage_disk.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/1k_storage_disk.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/1k_storage_disk.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/1k_storage_part.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/1k_storage_part.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/1k_storage_part.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/1k_storage_part.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/256b_fluid_storage_disk.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/256b_fluid_storage_disk.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/256b_fluid_storage_disk.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/256b_fluid_storage_disk.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/256b_fluid_storage_part.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/256b_fluid_storage_part.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/256b_fluid_storage_part.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/256b_fluid_storage_part.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/4096b_fluid_storage_disk.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/4096b_fluid_storage_disk.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/4096b_fluid_storage_disk.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/4096b_fluid_storage_disk.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/4096b_fluid_storage_part.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/4096b_fluid_storage_part.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/4096b_fluid_storage_part.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/4096b_fluid_storage_part.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/4k_storage_disk.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/4k_storage_disk.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/4k_storage_disk.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/4k_storage_disk.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/4k_storage_part.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/4k_storage_part.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/4k_storage_part.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/4k_storage_part.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/64b_fluid_storage_disk.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/64b_fluid_storage_disk.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/64b_fluid_storage_disk.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/64b_fluid_storage_disk.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/64b_fluid_storage_part.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/64b_fluid_storage_part.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/64b_fluid_storage_part.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/64b_fluid_storage_part.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/64k_storage_disk.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/64k_storage_disk.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/64k_storage_disk.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/64k_storage_disk.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/64k_storage_part.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/64k_storage_part.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/64k_storage_part.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/64k_storage_part.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/advanced_processor.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/advanced_processor.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/advanced_processor.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/advanced_processor.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/basic_processor.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/basic_processor.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/basic_processor.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/basic_processor.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/book.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/book.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/book.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/book.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/configuration_card/active.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/configuration_card/active.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/configuration_card/active.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/configuration_card/active.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/configuration_card/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/configuration_card/inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/configuration_card/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/configuration_card/inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/construction_core.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/construction_core.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/construction_core.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/construction_core.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/creative_fluid_storage_disk.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/creative_fluid_storage_disk.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/creative_fluid_storage_disk.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/creative_fluid_storage_disk.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/creative_range_upgrade.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/creative_range_upgrade.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/creative_range_upgrade.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/creative_range_upgrade.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/creative_storage_disk.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/creative_storage_disk.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/creative_storage_disk.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/creative_storage_disk.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/destruction_core.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/destruction_core.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/destruction_core.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/destruction_core.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/fortune_upgrade.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/fortune_upgrade.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/fortune_upgrade.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/fortune_upgrade.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/improved_processor.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/improved_processor.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/improved_processor.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/improved_processor.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/network_card/active.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/network_card/active.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/network_card/active.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/network_card/active.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/network_card/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/network_card/inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/network_card/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/network_card/inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/processor_binding.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/processor_binding.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/processor_binding.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/processor_binding.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/quartz_enriched_copper.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/quartz_enriched_copper.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/quartz_enriched_copper.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/quartz_enriched_copper.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/quartz_enriched_iron.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/quartz_enriched_iron.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/quartz_enriched_iron.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/quartz_enriched_iron.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/range_upgrade.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/range_upgrade.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/range_upgrade.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/range_upgrade.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/raw_advanced_processor.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/raw_advanced_processor.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/raw_advanced_processor.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/raw_advanced_processor.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/raw_basic_processor.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/raw_basic_processor.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/raw_basic_processor.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/raw_basic_processor.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/raw_improved_processor.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/raw_improved_processor.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/raw_improved_processor.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/raw_improved_processor.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/regulator_upgrade.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/regulator_upgrade.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/regulator_upgrade.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/regulator_upgrade.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/security_card/active.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/security_card/active.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/security_card/active.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/security_card/active.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/security_card/fallback.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/security_card/fallback.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/security_card/fallback.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/security_card/fallback.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/security_card/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/security_card/inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/security_card/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/security_card/inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/silicon.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/silicon.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/silicon.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/silicon.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/silk_touch_upgrade.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/silk_touch_upgrade.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/silk_touch_upgrade.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/silk_touch_upgrade.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/speed_upgrade.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/speed_upgrade.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/speed_upgrade.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/speed_upgrade.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/stack_upgrade.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/stack_upgrade.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/stack_upgrade.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/stack_upgrade.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/storage_housing.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/storage_housing.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/storage_housing.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/storage_housing.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/upgrade.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/upgrade.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/upgrade.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/upgrade.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/wireless_grid/active.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/wireless_grid/active.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/wireless_grid/active.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/wireless_grid/active.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/wireless_grid/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/wireless_grid/inactive.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/wireless_grid/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/wireless_grid/inactive.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/wrench.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/wrench.png similarity index 100% rename from refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/wrench.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/item/wrench.png diff --git a/refinedstorage-platform-common/src/main/resources/data/c/tags/item/tools/wrench.json b/refinedstorage-common/src/main/resources/data/c/tags/item/tools/wrench.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/c/tags/item/tools/wrench.json rename to refinedstorage-common/src/main/resources/data/c/tags/item/tools/wrench.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/better_than_a_barrel.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/better_than_a_barrel.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/better_than_a_barrel.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/better_than_a_barrel.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/conditional_connecting.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/conditional_connecting.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/conditional_connecting.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/conditional_connecting.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/connecting.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/connecting.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/connecting.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/connecting.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/construction.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/construction.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/construction.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/construction.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/destruction.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/destruction.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/destruction.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/destruction.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/detecting.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/detecting.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/detecting.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/detecting.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/drives.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/drives.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/drives.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/drives.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/exporting.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/exporting.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/exporting.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/exporting.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/importing.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/importing.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/importing.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/importing.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/interface_to_the_world.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/interface_to_the_world.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/interface_to_the_world.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/interface_to_the_world.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/interfacing_with_disks.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/interfacing_with_disks.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/interfacing_with_disks.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/interfacing_with_disks.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/no_cables_required.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/no_cables_required.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/no_cables_required.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/no_cables_required.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/portable_storage.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/portable_storage.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/portable_storage.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/portable_storage.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/root.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/root.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/root.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/root.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/security.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/security.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/security.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/security.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/storing_externally.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/storing_externally.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/storing_externally.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/storing_externally.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/storing_fluids.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/storing_fluids.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/storing_fluids.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/storing_fluids.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/storing_items.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/storing_items.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/storing_items.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/storing_items.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/upgrading.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/upgrading.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/upgrading.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/upgrading.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/upgrading_your_grid.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/upgrading_your_grid.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/upgrading_your_grid.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/upgrading_your_grid.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/viewing_your_storage.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/viewing_your_storage.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/viewing_your_storage.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/viewing_your_storage.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/wireless.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/wireless.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/wireless.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/advancement/wireless.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/1024b_fluid_storage_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/1024b_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/1024b_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/1024b_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/16k_storage_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/16k_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/16k_storage_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/16k_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/1k_storage_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/1k_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/1k_storage_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/1k_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/256b_fluid_storage_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/256b_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/256b_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/256b_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/4096b_fluid_storage_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/4096b_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/4096b_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/4096b_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/4k_storage_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/4k_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/4k_storage_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/4k_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/64b_fluid_storage_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/64b_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/64b_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/64b_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/64k_storage_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/64k_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/64k_storage_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/64k_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_fluid_storage_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_portable_grid.json b/refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_portable_grid.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_portable_grid.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_portable_grid.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_storage_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_storage_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/disk_drive.json b/refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/disk_drive.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/disk_drive.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/disk_drive.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/exporter.json b/refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/exporter.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/exporter.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/exporter.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/external_storage.json b/refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/external_storage.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/external_storage.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/importer.json b/refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/importer.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/importer.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/importer.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/interface.json b/refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/interface.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/interface.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/interface.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/machine_casing.json b/refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/machine_casing.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/machine_casing.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/machine_casing.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/portable_grid.json b/refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/portable_grid.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/portable_grid.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/portable_grid.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/quartz_enriched_iron_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/quartz_enriched_iron_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/quartz_enriched_iron_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/quartz_enriched_iron_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/storage_monitor.json b/refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/storage_monitor.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/storage_monitor.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/loot_table/blocks/storage_monitor.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_disk.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_disk.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_disk.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_disk.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_disk_from_storage_housing.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_disk_from_storage_housing.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_disk_from_storage_housing.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_disk_from_storage_housing.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_part.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_part.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_part.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_part.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/16k_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/16k_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_disk.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/16k_storage_disk.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_disk.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/16k_storage_disk.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_disk_from_storage_housing.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/16k_storage_disk_from_storage_housing.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_disk_from_storage_housing.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/16k_storage_disk_from_storage_housing.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_part.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/16k_storage_part.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_part.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/16k_storage_part.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/1k_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/1k_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_disk.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/1k_storage_disk.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_disk.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/1k_storage_disk.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_disk_from_storage_housing.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/1k_storage_disk_from_storage_housing.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_disk_from_storage_housing.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/1k_storage_disk_from_storage_housing.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_part.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/1k_storage_part.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_part.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/1k_storage_part.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_disk.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_disk.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_disk.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_disk.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_disk_from_storage_housing.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_disk_from_storage_housing.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_disk_from_storage_housing.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_disk_from_storage_housing.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_part.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_part.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_part.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_part.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_disk.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_disk.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_disk.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_disk.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_disk_from_storage_housing.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_disk_from_storage_housing.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_disk_from_storage_housing.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_disk_from_storage_housing.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_part.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_part.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_part.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_part.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/4k_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/4k_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_disk.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/4k_storage_disk.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_disk.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/4k_storage_disk.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_disk_from_storage_housing.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/4k_storage_disk_from_storage_housing.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_disk_from_storage_housing.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/4k_storage_disk_from_storage_housing.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_part.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/4k_storage_part.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_part.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/4k_storage_part.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_disk.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_disk.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_disk.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_disk.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_disk_from_storage_housing.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_disk_from_storage_housing.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_disk_from_storage_housing.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_disk_from_storage_housing.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_part.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_part.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_part.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_part.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/64k_storage_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/64k_storage_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_disk.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/64k_storage_disk.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_disk.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/64k_storage_disk.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_disk_from_storage_housing.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/64k_storage_disk_from_storage_housing.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_disk_from_storage_housing.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/64k_storage_disk_from_storage_housing.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_part.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/64k_storage_part.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_part.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/64k_storage_part.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/advanced_processor.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/advanced_processor.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/advanced_processor.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/advanced_processor.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/basic_processor.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/basic_processor.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/basic_processor.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/basic_processor.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/cable.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/cable.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/cable.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/cable.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/configuration_card.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/configuration_card.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/configuration_card.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/configuration_card.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/construction_core.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/construction_core.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/construction_core.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/construction_core.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/constructor.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/constructor.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/constructor.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/constructor.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/controller.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/controller.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/controller.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/controller.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/crafting_grid.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/crafting_grid.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/crafting_grid.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/crafting_grid.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/destruction_core.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/destruction_core.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/destruction_core.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/destruction_core.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/destructor.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/destructor.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/destructor.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/destructor.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/detector.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/detector.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/detector.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/detector.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/disk_drive.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/disk_drive.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/disk_drive.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/disk_drive.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/disk_interface.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/disk_interface.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/disk_interface.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/disk_interface.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/exporter.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/exporter.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/exporter.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/exporter.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/external_storage.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/external_storage.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/external_storage.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/external_storage.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fallback_security_card.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/fallback_security_card.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fallback_security_card.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/fallback_security_card.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fortune_1_upgrade.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/fortune_1_upgrade.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fortune_1_upgrade.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/fortune_1_upgrade.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fortune_2_upgrade.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/fortune_2_upgrade.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fortune_2_upgrade.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/fortune_2_upgrade.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fortune_3_upgrade.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/fortune_3_upgrade.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fortune_3_upgrade.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/fortune_3_upgrade.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/grid.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/grid.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/grid.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/grid.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/importer.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/importer.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/importer.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/importer.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/improved_processor.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/improved_processor.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/improved_processor.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/improved_processor.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/interface.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/interface.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/interface.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/interface.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/machine_casing.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/machine_casing.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/machine_casing.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/machine_casing.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/network_card.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/network_card.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/network_card.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/network_card.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/network_receiver.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/network_receiver.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/network_receiver.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/network_receiver.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/network_transmitter.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/network_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/network_transmitter.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/network_transmitter.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/portable_grid.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/portable_grid.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/portable_grid.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/portable_grid.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/processor_binding.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/processor_binding.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/processor_binding.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/processor_binding.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper_from_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper_from_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper_from_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper_from_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron_from_block.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron_from_block.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron_from_block.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron_from_block.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/range_upgrade.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/range_upgrade.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/range_upgrade.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/range_upgrade.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/raw_advanced_processor.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/raw_advanced_processor.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/raw_advanced_processor.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/raw_advanced_processor.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/raw_basic_processor.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/raw_basic_processor.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/raw_basic_processor.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/raw_basic_processor.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/raw_improved_processor.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/raw_improved_processor.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/raw_improved_processor.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/raw_improved_processor.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/regulator_upgrade.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/regulator_upgrade.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/regulator_upgrade.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/regulator_upgrade.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/relay.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/relay.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/relay.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/relay.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/security_card.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/security_card.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/security_card.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/security_card.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/security_manager.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/security_manager.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/security_manager.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/security_manager.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/silicon.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/silicon.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/silicon.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/silicon.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/silk_touch_upgrade.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/silk_touch_upgrade.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/silk_touch_upgrade.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/silk_touch_upgrade.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/speed_upgrade.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/speed_upgrade.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/speed_upgrade.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/speed_upgrade.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/stack_upgrade.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/stack_upgrade.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/stack_upgrade.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/stack_upgrade.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/storage_housing.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/storage_housing.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/storage_housing.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/storage_housing.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/storage_monitor.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/storage_monitor.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/storage_monitor.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/storage_monitor.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/upgrade.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/upgrade.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/upgrade.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/upgrade.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/wireless_grid.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/wireless_grid.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/wireless_grid.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/wireless_grid.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/wireless_transmitter.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/wireless_transmitter.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/wireless_transmitter.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/wireless_transmitter.json diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/wrench.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/wrench.json similarity index 100% rename from refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/wrench.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/wrench.json diff --git a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/SetupMinecraft.java b/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/SetupMinecraft.java similarity index 88% rename from refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/SetupMinecraft.java rename to refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/SetupMinecraft.java index eaf1044bf..4c817ab4d 100644 --- a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/SetupMinecraft.java +++ b/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/SetupMinecraft.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common; +package com.refinedmods.refinedstorage.common; import net.minecraft.SharedConstants; import net.minecraft.server.Bootstrap; diff --git a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/TestPlatform.java b/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/TestPlatform.java similarity index 91% rename from refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/TestPlatform.java rename to refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/TestPlatform.java index b6d371334..85c1611aa 100644 --- a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/TestPlatform.java +++ b/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/TestPlatform.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.common; +package com.refinedmods.refinedstorage.common; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.support.resource.FluidOperationResult; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.MenuOpener; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferManager; -import com.refinedmods.refinedstorage.platform.common.support.render.FluidRenderer; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategyFactory; +import com.refinedmods.refinedstorage.common.api.support.resource.FluidOperationResult; +import com.refinedmods.refinedstorage.common.support.containermenu.MenuOpener; +import com.refinedmods.refinedstorage.common.support.containermenu.TransferManager; +import com.refinedmods.refinedstorage.common.support.render.FluidRenderer; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.io.File; import java.util.List; diff --git a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/grid/GridSortingTypesTest.java b/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/grid/GridSortingTypesTest.java similarity index 94% rename from refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/grid/GridSortingTypesTest.java rename to refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/grid/GridSortingTypesTest.java index 367c0be1c..3d22021ab 100644 --- a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/grid/GridSortingTypesTest.java +++ b/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/grid/GridSortingTypesTest.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.grid; +package com.refinedmods.refinedstorage.common.grid; import com.refinedmods.refinedstorage.api.grid.view.GridResource; import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; @@ -7,9 +7,9 @@ import com.refinedmods.refinedstorage.api.grid.view.GridViewBuilder; import com.refinedmods.refinedstorage.api.grid.view.GridViewBuilderImpl; import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage.platform.common.SetupMinecraft; -import com.refinedmods.refinedstorage.platform.common.grid.view.AbstractItemGridResourceFactory; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.SetupMinecraft; +import com.refinedmods.refinedstorage.common.grid.view.AbstractItemGridResourceFactory; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.util.Comparator; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/grid/screen/LastModifiedTest.java b/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/grid/screen/LastModifiedTest.java similarity index 98% rename from refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/grid/screen/LastModifiedTest.java rename to refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/grid/screen/LastModifiedTest.java index 2f50d9b97..ef9dcb8b5 100644 --- a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/grid/screen/LastModifiedTest.java +++ b/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/grid/screen/LastModifiedTest.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.grid.screen; +package com.refinedmods.refinedstorage.common.grid.screen; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/storage/ClientStorageRepositoryTest.java b/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/storage/ClientStorageRepositoryTest.java similarity index 91% rename from refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/storage/ClientStorageRepositoryTest.java rename to refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/storage/ClientStorageRepositoryTest.java index beb96e358..548c59d95 100644 --- a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/storage/ClientStorageRepositoryTest.java +++ b/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/storage/ClientStorageRepositoryTest.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.storage; +package com.refinedmods.refinedstorage.common.storage; -import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; +import com.refinedmods.refinedstorage.common.api.storage.StorageInfo; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/registry/PlatformRegistryImplTest.java b/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/support/registry/PlatformRegistryImplTest.java similarity index 92% rename from refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/registry/PlatformRegistryImplTest.java rename to refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/support/registry/PlatformRegistryImplTest.java index 12fc3db13..7d819860d 100644 --- a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/registry/PlatformRegistryImplTest.java +++ b/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/support/registry/PlatformRegistryImplTest.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.common.support.registry; +package com.refinedmods.refinedstorage.common.support.registry; -import com.refinedmods.refinedstorage.platform.api.support.registry.PlatformRegistry; +import com.refinedmods.refinedstorage.common.api.support.registry.PlatformRegistry; import java.util.List; @@ -43,7 +43,7 @@ void shouldNotBeAbleToModifyUnderlyingRegistryList() { } @Test - @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug + @SuppressWarnings("AssertBetweenInconvertibleTypes") void shouldRegisterAndRetrieve() { // Act sut.register(A, 10); diff --git a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceRenderingTest.java b/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceRenderingTest.java similarity index 89% rename from refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceRenderingTest.java rename to refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceRenderingTest.java index ed9367865..e72d9b78a 100644 --- a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceRenderingTest.java +++ b/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceRenderingTest.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.support.resource; +package com.refinedmods.refinedstorage.common.support.resource; -import com.refinedmods.refinedstorage.platform.common.PlatformProxy; -import com.refinedmods.refinedstorage.platform.common.TestPlatform; +import com.refinedmods.refinedstorage.common.PlatformProxy; +import com.refinedmods.refinedstorage.common.TestPlatform; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/FuzzyResourceListImplTest.java b/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/support/resource/list/FuzzyResourceListImplTest.java similarity index 93% rename from refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/FuzzyResourceListImplTest.java rename to refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/support/resource/list/FuzzyResourceListImplTest.java index 49ff58b57..dfc5dfcc3 100644 --- a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/FuzzyResourceListImplTest.java +++ b/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/support/resource/list/FuzzyResourceListImplTest.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.support.resource.list; +package com.refinedmods.refinedstorage.common.support.resource.list; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage.platform.api.support.resource.list.FuzzyResourceList; -import com.refinedmods.refinedstorage.platform.common.SetupMinecraft; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.SetupMinecraft; +import com.refinedmods.refinedstorage.common.api.support.resource.list.FuzzyResourceList; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.util.Collection; import java.util.Optional; @@ -37,7 +37,7 @@ void setUp() { } @Test - @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug + @SuppressWarnings("AssertBetweenInconvertibleTypes") void testRetrievingFuzzy() { // Arrange sut.add(DUMMY_A, 5); @@ -93,7 +93,7 @@ void testRetrievingFuzzy() { } @Test - @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug + @SuppressWarnings("AssertBetweenInconvertibleTypes") void shouldRemoveEntireResourceFromFuzzyIndexAfterRemoval() { // Arrange sut.add(DUMMY_A, 5); @@ -139,7 +139,7 @@ void shouldRemoveEntireResourceFromFuzzyIndexAfterRemoval() { } @Test - @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug + @SuppressWarnings("AssertBetweenInconvertibleTypes") void shouldRemoveSingleResourceFromFuzzyIndexAfterRemoval() { // Arrange sut.add(DUMMY_A, 5); diff --git a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/widget/HistoryTest.java b/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/support/widget/HistoryTest.java similarity index 97% rename from refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/widget/HistoryTest.java rename to refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/support/widget/HistoryTest.java index 647c35726..389f8a5cb 100644 --- a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/widget/HistoryTest.java +++ b/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/support/widget/HistoryTest.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common.support.widget; +package com.refinedmods.refinedstorage.common.support.widget; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-fabric/build.gradle.kts b/refinedstorage-fabric/build.gradle.kts similarity index 85% rename from refinedstorage-platform-fabric/build.gradle.kts rename to refinedstorage-fabric/build.gradle.kts index 9b36e7251..0d1bf8c5a 100644 --- a/refinedstorage-platform-fabric/build.gradle.kts +++ b/refinedstorage-fabric/build.gradle.kts @@ -16,8 +16,8 @@ repositories { refinedarchitect { modId = "refinedstorage" fabric() - compileWithProject(project(":refinedstorage-platform-common")) - compileWithProject(project(":refinedstorage-platform-api")) + compileWithProject(project(":refinedstorage-common")) + compileWithProject(project(":refinedstorage-common-api")) addProject(project(":refinedstorage-core-api")) addProject(project(":refinedstorage-resource-api")) addProject(project(":refinedstorage-storage-api")) @@ -33,7 +33,7 @@ refinedarchitect { } base { - archivesName.set("refinedstorage-platform-fabric") + archivesName.set("refinedstorage-fabric") } dependencies { diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ClientModInitializerImpl.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ClientModInitializerImpl.java similarity index 83% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ClientModInitializerImpl.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ClientModInitializerImpl.java index e8d34a1b1..6fee96968 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ClientModInitializerImpl.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ClientModInitializerImpl.java @@ -1,46 +1,46 @@ -package com.refinedmods.refinedstorage.platform.fabric; +package com.refinedmods.refinedstorage.fabric; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage.platform.api.upgrade.AbstractUpgradeItem; -import com.refinedmods.refinedstorage.platform.common.AbstractClientModInitializer; -import com.refinedmods.refinedstorage.platform.common.configurationcard.ConfigurationCardItemPropertyFunction; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.content.KeyMappings; -import com.refinedmods.refinedstorage.platform.common.controller.ControllerItemPropertyFunction; -import com.refinedmods.refinedstorage.platform.common.networking.NetworkCardItemPropertyFunction; -import com.refinedmods.refinedstorage.platform.common.security.SecurityCardItemPropertyFunction; -import com.refinedmods.refinedstorage.platform.common.storagemonitor.StorageMonitorBlockEntityRenderer; -import com.refinedmods.refinedstorage.platform.common.support.network.bounditem.NetworkBoundItemItemPropertyFunction; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketHandler; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.EnergyInfoPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.GridActivePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.GridClearPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.GridUpdatePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.NetworkTransmitterStatusPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.NoPermissionPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.ResourceSlotUpdatePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.StorageInfoResponsePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.WirelessTransmitterRangePacket; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.CompositeClientTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.HelpClientTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.ResourceClientTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.upgrade.RegulatorUpgradeItem; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinationClientTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil; -import com.refinedmods.refinedstorage.platform.fabric.mixin.ItemPropertiesAccessor; -import com.refinedmods.refinedstorage.platform.fabric.storage.diskdrive.DiskDriveBlockEntityRendererImpl; -import com.refinedmods.refinedstorage.platform.fabric.storage.diskdrive.DiskDriveUnbakedModel; -import com.refinedmods.refinedstorage.platform.fabric.storage.diskinterface.DiskInterfaceBlockEntityRendererImpl; -import com.refinedmods.refinedstorage.platform.fabric.storage.diskinterface.DiskInterfaceUnbakedModel; -import com.refinedmods.refinedstorage.platform.fabric.storage.portablegrid.PortableGridBlockEntityRendererImpl; -import com.refinedmods.refinedstorage.platform.fabric.storage.portablegrid.PortableGridUnbakedModel; -import com.refinedmods.refinedstorage.platform.fabric.support.render.EmissiveModelRegistry; -import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadRotators; +import com.refinedmods.refinedstorage.common.AbstractClientModInitializer; +import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.common.api.upgrade.AbstractUpgradeItem; +import com.refinedmods.refinedstorage.common.configurationcard.ConfigurationCardItemPropertyFunction; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.common.content.KeyMappings; +import com.refinedmods.refinedstorage.common.controller.ControllerItemPropertyFunction; +import com.refinedmods.refinedstorage.common.networking.NetworkCardItemPropertyFunction; +import com.refinedmods.refinedstorage.common.security.SecurityCardItemPropertyFunction; +import com.refinedmods.refinedstorage.common.storagemonitor.StorageMonitorBlockEntityRenderer; +import com.refinedmods.refinedstorage.common.support.network.bounditem.NetworkBoundItemItemPropertyFunction; +import com.refinedmods.refinedstorage.common.support.packet.PacketHandler; +import com.refinedmods.refinedstorage.common.support.packet.s2c.EnergyInfoPacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.GridActivePacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.GridClearPacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.GridUpdatePacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.NetworkTransmitterStatusPacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.NoPermissionPacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.ResourceSlotUpdatePacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.StorageInfoResponsePacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.WirelessTransmitterRangePacket; +import com.refinedmods.refinedstorage.common.support.tooltip.CompositeClientTooltipComponent; +import com.refinedmods.refinedstorage.common.support.tooltip.HelpClientTooltipComponent; +import com.refinedmods.refinedstorage.common.support.tooltip.ResourceClientTooltipComponent; +import com.refinedmods.refinedstorage.common.upgrade.RegulatorUpgradeItem; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinationClientTooltipComponent; +import com.refinedmods.refinedstorage.common.util.IdentifierUtil; +import com.refinedmods.refinedstorage.fabric.mixin.ItemPropertiesAccessor; +import com.refinedmods.refinedstorage.fabric.storage.diskdrive.DiskDriveBlockEntityRendererImpl; +import com.refinedmods.refinedstorage.fabric.storage.diskdrive.DiskDriveUnbakedModel; +import com.refinedmods.refinedstorage.fabric.storage.diskinterface.DiskInterfaceBlockEntityRendererImpl; +import com.refinedmods.refinedstorage.fabric.storage.diskinterface.DiskInterfaceUnbakedModel; +import com.refinedmods.refinedstorage.fabric.storage.portablegrid.PortableGridBlockEntityRendererImpl; +import com.refinedmods.refinedstorage.fabric.storage.portablegrid.PortableGridUnbakedModel; +import com.refinedmods.refinedstorage.fabric.support.render.EmissiveModelRegistry; +import com.refinedmods.refinedstorage.fabric.support.render.QuadRotators; import java.util.List; @@ -68,7 +68,7 @@ import net.minecraft.world.level.block.Block; import org.lwjgl.glfw.GLFW; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public class ClientModInitializerImpl extends AbstractClientModInitializer implements ClientModInitializer { private static final String BLOCK_PREFIX = "block"; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ConfigImpl.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ConfigImpl.java similarity index 97% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ConfigImpl.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ConfigImpl.java index 11aaf2eb3..440f1fcbf 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ConfigImpl.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ConfigImpl.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.fabric; +package com.refinedmods.refinedstorage.fabric; import com.refinedmods.refinedstorage.api.grid.view.GridSortingDirection; -import com.refinedmods.refinedstorage.platform.common.content.DefaultEnergyUsage; -import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridMatrixCloseBehavior; -import com.refinedmods.refinedstorage.platform.common.grid.GridSortingTypes; -import com.refinedmods.refinedstorage.platform.common.support.stretching.ScreenSize; -import com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil; +import com.refinedmods.refinedstorage.common.content.DefaultEnergyUsage; +import com.refinedmods.refinedstorage.common.grid.CraftingGridMatrixCloseBehavior; +import com.refinedmods.refinedstorage.common.grid.GridSortingTypes; +import com.refinedmods.refinedstorage.common.support.stretching.ScreenSize; +import com.refinedmods.refinedstorage.common.util.IdentifierUtil; import java.util.Optional; @@ -17,7 +17,7 @@ @SuppressWarnings({"FieldCanBeLocal", "FieldMayBeFinal", "CanBeFinal"}) @Config(name = IdentifierUtil.MOD_ID) -public class ConfigImpl implements ConfigData, com.refinedmods.refinedstorage.platform.common.Config { +public class ConfigImpl implements ConfigData, com.refinedmods.refinedstorage.common.Config { private ScreenSize screenSize = ScreenSize.STRETCH; private boolean smoothScrolling = true; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ModInitializerImpl.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ModInitializerImpl.java similarity index 77% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ModInitializerImpl.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ModInitializerImpl.java index 6ccf93436..44aed0ea0 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ModInitializerImpl.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ModInitializerImpl.java @@ -1,72 +1,72 @@ -package com.refinedmods.refinedstorage.platform.fabric; +package com.refinedmods.refinedstorage.fabric; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.RefinedStoragePlugin; -import com.refinedmods.refinedstorage.platform.common.AbstractModInitializer; -import com.refinedmods.refinedstorage.platform.common.PlatformProxy; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntityTypeFactory; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.content.CreativeModeTabItems; -import com.refinedmods.refinedstorage.platform.common.content.DirectRegistryCallback; -import com.refinedmods.refinedstorage.platform.common.content.ExtendedMenuTypeFactory; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.content.MenuTypeFactory; -import com.refinedmods.refinedstorage.platform.common.content.RegistryCallback; -import com.refinedmods.refinedstorage.platform.common.grid.WirelessGridItem; -import com.refinedmods.refinedstorage.platform.common.iface.InterfaceBlockEntity; -import com.refinedmods.refinedstorage.platform.common.iface.InterfacePlatformExternalStorageProviderFactory; -import com.refinedmods.refinedstorage.platform.common.security.FallbackSecurityCardItem; -import com.refinedmods.refinedstorage.platform.common.security.SecurityCardItem; -import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlockItem; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridType; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseBlock; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketHandler; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.CraftingGridClearPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.CraftingGridRecipeTransferPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.GridExtractPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.GridInsertPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.GridScrollPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.PropertyChangePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.ResourceFilterSlotChangePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.ResourceSlotAmountChangePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.ResourceSlotChangePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.SecurityCardBoundPlayerPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.SecurityCardPermissionPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.SecurityCardResetPermissionPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.SingleAmountChangePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.StorageInfoRequestPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.UseSlotReferencedItemPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.EnergyInfoPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.GridActivePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.GridClearPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.GridUpdatePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.NetworkTransmitterStatusPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.NoPermissionPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.ResourceSlotUpdatePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.StorageInfoResponsePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.WirelessTransmitterRangePacket; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage.platform.common.upgrade.RegulatorUpgradeItem; -import com.refinedmods.refinedstorage.platform.common.util.ServerEventQueue; -import com.refinedmods.refinedstorage.platform.fabric.exporter.FabricStorageExporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.platform.fabric.grid.strategy.FluidGridExtractionStrategy; -import com.refinedmods.refinedstorage.platform.fabric.grid.strategy.FluidGridInsertionStrategy; -import com.refinedmods.refinedstorage.platform.fabric.grid.strategy.ItemGridExtractionStrategy; -import com.refinedmods.refinedstorage.platform.fabric.grid.strategy.ItemGridScrollingStrategy; -import com.refinedmods.refinedstorage.platform.fabric.importer.FabricStorageImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.platform.fabric.security.NetworkNodeBreakSecurityEventListener; -import com.refinedmods.refinedstorage.platform.fabric.storage.diskdrive.FabricDiskDriveBlockEntity; -import com.refinedmods.refinedstorage.platform.fabric.storage.diskinterface.FabricDiskInterfaceBlockEntity; -import com.refinedmods.refinedstorage.platform.fabric.storage.externalstorage.FabricStoragePlatformExternalStorageProviderFactory; -import com.refinedmods.refinedstorage.platform.fabric.storage.portablegrid.FabricPortableGridBlockEntity; -import com.refinedmods.refinedstorage.platform.fabric.support.energy.EnergyStorageAdapter; -import com.refinedmods.refinedstorage.platform.fabric.support.resource.ResourceContainerFluidStorageAdapter; -import com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil; +import com.refinedmods.refinedstorage.common.AbstractModInitializer; +import com.refinedmods.refinedstorage.common.PlatformProxy; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStoragePlugin; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.BlockEntityTypeFactory; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.content.CreativeModeTabItems; +import com.refinedmods.refinedstorage.common.content.DirectRegistryCallback; +import com.refinedmods.refinedstorage.common.content.ExtendedMenuTypeFactory; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.common.content.MenuTypeFactory; +import com.refinedmods.refinedstorage.common.content.RegistryCallback; +import com.refinedmods.refinedstorage.common.grid.WirelessGridItem; +import com.refinedmods.refinedstorage.common.iface.InterfaceBlockEntity; +import com.refinedmods.refinedstorage.common.iface.InterfacePlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.common.security.FallbackSecurityCardItem; +import com.refinedmods.refinedstorage.common.security.SecurityCardItem; +import com.refinedmods.refinedstorage.common.storage.diskdrive.AbstractDiskDriveBlockEntity; +import com.refinedmods.refinedstorage.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridBlockItem; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridType; +import com.refinedmods.refinedstorage.common.support.AbstractBaseBlock; +import com.refinedmods.refinedstorage.common.support.packet.PacketHandler; +import com.refinedmods.refinedstorage.common.support.packet.c2s.CraftingGridClearPacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.CraftingGridRecipeTransferPacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.GridExtractPacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.GridInsertPacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.GridScrollPacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.PropertyChangePacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.ResourceFilterSlotChangePacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.ResourceSlotAmountChangePacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.ResourceSlotChangePacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.SecurityCardBoundPlayerPacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.SecurityCardPermissionPacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.SecurityCardResetPermissionPacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.SingleAmountChangePacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.StorageInfoRequestPacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.UseSlotReferencedItemPacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.EnergyInfoPacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.GridActivePacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.GridClearPacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.GridUpdatePacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.NetworkTransmitterStatusPacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.NoPermissionPacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.ResourceSlotUpdatePacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.StorageInfoResponsePacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.WirelessTransmitterRangePacket; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.upgrade.RegulatorUpgradeItem; +import com.refinedmods.refinedstorage.common.util.ServerEventQueue; +import com.refinedmods.refinedstorage.fabric.exporter.FabricStorageExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.fabric.grid.strategy.FluidGridExtractionStrategy; +import com.refinedmods.refinedstorage.fabric.grid.strategy.FluidGridInsertionStrategy; +import com.refinedmods.refinedstorage.fabric.grid.strategy.ItemGridExtractionStrategy; +import com.refinedmods.refinedstorage.fabric.grid.strategy.ItemGridScrollingStrategy; +import com.refinedmods.refinedstorage.fabric.importer.FabricStorageImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.fabric.security.NetworkNodeBreakSecurityEventListener; +import com.refinedmods.refinedstorage.fabric.storage.diskdrive.FabricDiskDriveBlockEntity; +import com.refinedmods.refinedstorage.fabric.storage.diskinterface.FabricDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.fabric.storage.externalstorage.FabricStoragePlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.fabric.storage.portablegrid.FabricPortableGridBlockEntity; +import com.refinedmods.refinedstorage.fabric.support.energy.EnergyStorageAdapter; +import com.refinedmods.refinedstorage.fabric.support.resource.ResourceContainerFluidStorageAdapter; +import com.refinedmods.refinedstorage.fabric.support.resource.VariantUtil; import java.util.ArrayList; import java.util.Arrays; @@ -116,14 +116,16 @@ import org.slf4j.LoggerFactory; import team.reborn.energy.api.EnergyStorage; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CREATIVE_PORTABLE_GRID; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CREATIVE_WIRELESS_GRID; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.FALLBACK_SECURITY_CARD; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.PORTABLE_GRID; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.REGULATOR_UPGRADE; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.SECURITY_CARD; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.WIRELESS_GRID; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.content.ContentIds.CREATIVE_PORTABLE_GRID; +import static com.refinedmods.refinedstorage.common.content.ContentIds.CREATIVE_WIRELESS_GRID; +import static com.refinedmods.refinedstorage.common.content.ContentIds.FALLBACK_SECURITY_CARD; +import static com.refinedmods.refinedstorage.common.content.ContentIds.PORTABLE_GRID; +import static com.refinedmods.refinedstorage.common.content.ContentIds.REGULATOR_UPGRADE; +import static com.refinedmods.refinedstorage.common.content.ContentIds.SECURITY_CARD; +import static com.refinedmods.refinedstorage.common.content.ContentIds.WIRELESS_GRID; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.fabric.support.resource.VariantUtil.toFluidVariant; +import static com.refinedmods.refinedstorage.fabric.support.resource.VariantUtil.toItemVariant; public class ModInitializerImpl extends AbstractModInitializer implements ModInitializer { private static final Logger LOGGER = LoggerFactory.getLogger(ModInitializerImpl.class); @@ -179,7 +181,7 @@ private void registerImporterTransferStrategyFactories() { ItemStorage.SIDED, VariantUtil::ofItemVariant, resource -> resource instanceof ItemResource itemResource - ? VariantUtil.toItemVariant(itemResource) : null, + ? toItemVariant(itemResource) : null, 1 ) ); @@ -189,7 +191,7 @@ private void registerImporterTransferStrategyFactories() { FluidStorage.SIDED, VariantUtil::ofFluidVariant, resource -> resource instanceof FluidResource fluidResource - ? VariantUtil.toFluidVariant(fluidResource) : null, + ? toFluidVariant(fluidResource) : null, FluidConstants.BUCKET ) ); @@ -201,7 +203,7 @@ private void registerExporterTransferStrategyFactories() { new FabricStorageExporterTransferStrategyFactory<>( ItemStorage.SIDED, resource -> resource instanceof ItemResource itemResource - ? VariantUtil.toItemVariant(itemResource) : null, + ? toItemVariant(itemResource) : null, 1 ) ); @@ -210,7 +212,7 @@ private void registerExporterTransferStrategyFactories() { new FabricStorageExporterTransferStrategyFactory<>( FluidStorage.SIDED, resource -> resource instanceof FluidResource fluidResource - ? VariantUtil.toFluidVariant(fluidResource) : null, + ? toFluidVariant(fluidResource) : null, FluidConstants.BUCKET ) ); @@ -223,14 +225,14 @@ private void registerExternalStorageProviderFactories() { ItemStorage.SIDED, VariantUtil::ofItemVariant, resource -> resource instanceof ItemResource itemResource - ? VariantUtil.toItemVariant(itemResource) : null + ? toItemVariant(itemResource) : null )); PlatformApi.INSTANCE.addExternalStorageProviderFactory( new FabricStoragePlatformExternalStorageProviderFactory<>( FluidStorage.SIDED, VariantUtil::ofFluidVariant, resource -> resource instanceof FluidResource fluidResource - ? VariantUtil.toFluidVariant(fluidResource) : null + ? toFluidVariant(fluidResource) : null )); } diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/PlatformImpl.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/PlatformImpl.java similarity index 90% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/PlatformImpl.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/PlatformImpl.java index 50f91f096..6e3fe4e50 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/PlatformImpl.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/PlatformImpl.java @@ -1,26 +1,27 @@ -package com.refinedmods.refinedstorage.platform.fabric; +package com.refinedmods.refinedstorage.fabric; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.platform.api.support.resource.FluidOperationResult; -import com.refinedmods.refinedstorage.platform.common.AbstractPlatform; -import com.refinedmods.refinedstorage.platform.common.Config; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferManager; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage.platform.common.util.CustomBlockPlaceContext; -import com.refinedmods.refinedstorage.platform.fabric.grid.strategy.ItemGridInsertionStrategy; -import com.refinedmods.refinedstorage.platform.fabric.grid.view.FabricFluidGridResourceFactory; -import com.refinedmods.refinedstorage.platform.fabric.grid.view.FabricItemGridResourceFactory; -import com.refinedmods.refinedstorage.platform.fabric.mixin.EditBoxAccessor; -import com.refinedmods.refinedstorage.platform.fabric.mixin.KeyMappingAccessor; -import com.refinedmods.refinedstorage.platform.fabric.support.containermenu.ContainerTransferDestination; -import com.refinedmods.refinedstorage.platform.fabric.support.containermenu.MenuOpenerImpl; -import com.refinedmods.refinedstorage.platform.fabric.support.energy.EnergyStorageAdapter; -import com.refinedmods.refinedstorage.platform.fabric.support.render.FluidVariantFluidRenderer; -import com.refinedmods.refinedstorage.platform.fabric.util.SimpleSingleStackStorage; +import com.refinedmods.refinedstorage.common.AbstractPlatform; +import com.refinedmods.refinedstorage.common.Config; +import com.refinedmods.refinedstorage.common.api.support.resource.FluidOperationResult; +import com.refinedmods.refinedstorage.common.support.containermenu.TransferManager; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.util.CustomBlockPlaceContext; +import com.refinedmods.refinedstorage.fabric.grid.strategy.ItemGridInsertionStrategy; +import com.refinedmods.refinedstorage.fabric.grid.view.FabricFluidGridResourceFactory; +import com.refinedmods.refinedstorage.fabric.grid.view.FabricItemGridResourceFactory; +import com.refinedmods.refinedstorage.fabric.mixin.EditBoxAccessor; +import com.refinedmods.refinedstorage.fabric.mixin.KeyMappingAccessor; +import com.refinedmods.refinedstorage.fabric.support.containermenu.ContainerTransferDestination; +import com.refinedmods.refinedstorage.fabric.support.containermenu.MenuOpenerImpl; +import com.refinedmods.refinedstorage.fabric.support.energy.EnergyStorageAdapter; +import com.refinedmods.refinedstorage.fabric.support.render.FluidVariantFluidRenderer; +import com.refinedmods.refinedstorage.fabric.support.resource.VariantUtil; +import com.refinedmods.refinedstorage.fabric.util.SimpleSingleStackStorage; import java.io.File; import java.io.IOException; @@ -99,9 +100,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.ofFluidVariant; -import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.toFluidVariant; -import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.toItemVariant; +import static com.refinedmods.refinedstorage.fabric.support.resource.VariantUtil.toFluidVariant; +import static com.refinedmods.refinedstorage.fabric.support.resource.VariantUtil.toItemVariant; public final class PlatformImpl extends AbstractPlatform { private static final Logger LOGGER = LoggerFactory.getLogger(PlatformImpl.class); @@ -159,7 +159,7 @@ public Optional drainContainer(final ItemStack container) } return Optional.of(new FluidOperationResult( interceptingStorage.getStack(), - ofFluidVariant(extracted.resource()), + VariantUtil.ofFluidVariant(extracted.resource()), extracted.amount() )); } diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java similarity index 82% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java index d8b7465cc..cf917427d 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.fabric.exporter; +package com.refinedmods.refinedstorage.fabric.exporter; import com.refinedmods.refinedstorage.api.network.impl.node.exporter.ExporterTransferStrategyImpl; import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.api.exporter.ExporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.exporter.FuzzyExporterTransferStrategy; -import com.refinedmods.refinedstorage.platform.fabric.storage.FabricStorageInsertableStorage; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.exporter.ExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.common.exporter.FuzzyExporterTransferStrategy; +import com.refinedmods.refinedstorage.fabric.storage.FabricStorageInsertableStorage; import java.util.function.Function; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/exporter/package-info.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/exporter/package-info.java new file mode 100644 index 000000000..095587579 --- /dev/null +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/exporter/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.fabric.exporter; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/FluidGridExtractionStrategy.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/FluidGridExtractionStrategy.java similarity index 89% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/FluidGridExtractionStrategy.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/FluidGridExtractionStrategy.java index 4bc97ff42..2665dbb22 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/FluidGridExtractionStrategy.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/FluidGridExtractionStrategy.java @@ -1,17 +1,17 @@ -package com.refinedmods.refinedstorage.platform.fabric.grid.strategy; +package com.refinedmods.refinedstorage.fabric.grid.strategy; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; import com.refinedmods.refinedstorage.api.storage.EmptyActor; import com.refinedmods.refinedstorage.api.storage.Storage; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; -import com.refinedmods.refinedstorage.platform.fabric.util.SimpleSingleStackStorage; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage.fabric.util.SimpleSingleStackStorage; import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; @@ -23,7 +23,7 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.item.Items; -import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.toFluidVariant; +import static com.refinedmods.refinedstorage.fabric.support.resource.VariantUtil.toFluidVariant; public class FluidGridExtractionStrategy implements GridExtractionStrategy { private static final ItemVariant BUCKET_ITEM_VARIANT = ItemVariant.of(Items.BUCKET); diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/FluidGridInsertionStrategy.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/FluidGridInsertionStrategy.java similarity index 88% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/FluidGridInsertionStrategy.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/FluidGridInsertionStrategy.java index bdf9c18b4..c61f43376 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/FluidGridInsertionStrategy.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/FluidGridInsertionStrategy.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.fabric.grid.strategy; +package com.refinedmods.refinedstorage.fabric.grid.strategy; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.ResourceTypes; import javax.annotation.Nullable; @@ -23,8 +23,8 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; -import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.ofFluidVariant; -import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.toFluidVariant; +import static com.refinedmods.refinedstorage.fabric.support.resource.VariantUtil.ofFluidVariant; +import static com.refinedmods.refinedstorage.fabric.support.resource.VariantUtil.toFluidVariant; public class FluidGridInsertionStrategy implements GridInsertionStrategy { private final AbstractContainerMenu containerMenu; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridExtractionStrategy.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/ItemGridExtractionStrategy.java similarity index 81% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridExtractionStrategy.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/ItemGridExtractionStrategy.java index 68e4d19e2..b7687abe7 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridExtractionStrategy.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/ItemGridExtractionStrategy.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.fabric.grid.strategy; +package com.refinedmods.refinedstorage.fabric.grid.strategy; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.resource.ResourceTypes; import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; import net.fabricmc.fabric.api.transfer.v1.item.PlayerInventoryStorage; @@ -17,7 +17,7 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.inventory.AbstractContainerMenu; -import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.toItemVariant; +import static com.refinedmods.refinedstorage.fabric.support.resource.VariantUtil.toItemVariant; public class ItemGridExtractionStrategy implements GridExtractionStrategy { private final GridOperations gridOperations; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridInsertionStrategy.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/ItemGridInsertionStrategy.java similarity index 85% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridInsertionStrategy.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/ItemGridInsertionStrategy.java index 27e130588..c77df10d0 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridInsertionStrategy.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/ItemGridInsertionStrategy.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.fabric.grid.strategy; +package com.refinedmods.refinedstorage.fabric.grid.strategy; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.resource.ResourceTypes; import net.fabricmc.fabric.api.transfer.v1.item.InventoryStorage; import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; @@ -19,8 +19,8 @@ import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.ofItemVariant; -import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.toItemVariant; +import static com.refinedmods.refinedstorage.fabric.support.resource.VariantUtil.ofItemVariant; +import static com.refinedmods.refinedstorage.fabric.support.resource.VariantUtil.toItemVariant; public class ItemGridInsertionStrategy implements GridInsertionStrategy { private final AbstractContainerMenu containerMenu; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridScrollingStrategy.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/ItemGridScrollingStrategy.java similarity index 85% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridScrollingStrategy.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/ItemGridScrollingStrategy.java index f59b5c80e..c1aa1b03f 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridScrollingStrategy.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/ItemGridScrollingStrategy.java @@ -1,15 +1,15 @@ -package com.refinedmods.refinedstorage.platform.fabric.grid.strategy; +package com.refinedmods.refinedstorage.fabric.grid.strategy; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.resource.ResourceTypes; import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; import net.fabricmc.fabric.api.transfer.v1.item.PlayerInventoryStorage; @@ -19,7 +19,7 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.inventory.AbstractContainerMenu; -import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.toItemVariant; +import static com.refinedmods.refinedstorage.fabric.support.resource.VariantUtil.toItemVariant; public class ItemGridScrollingStrategy implements GridScrollingStrategy { private final GridOperations gridOperations; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/package-info.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/package-info.java new file mode 100644 index 000000000..266a1fea1 --- /dev/null +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.fabric.grid.strategy; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/view/FabricFluidGridResourceFactory.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/view/FabricFluidGridResourceFactory.java similarity index 77% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/view/FabricFluidGridResourceFactory.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/view/FabricFluidGridResourceFactory.java index f9fb4b98a..50535f1c8 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/view/FabricFluidGridResourceFactory.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/view/FabricFluidGridResourceFactory.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.fabric.grid.view; +package com.refinedmods.refinedstorage.fabric.grid.view; -import com.refinedmods.refinedstorage.platform.common.grid.view.AbstractFluidGridResourceFactory; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.grid.view.AbstractFluidGridResourceFactory; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; import java.util.stream.Collectors; @@ -12,7 +12,7 @@ import net.fabricmc.loader.api.metadata.ModMetadata; import net.minecraft.network.chat.Component; -import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.toFluidVariant; +import static com.refinedmods.refinedstorage.fabric.support.resource.VariantUtil.toFluidVariant; public class FabricFluidGridResourceFactory extends AbstractFluidGridResourceFactory { @Override diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/view/FabricItemGridResourceFactory.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/view/FabricItemGridResourceFactory.java similarity index 82% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/view/FabricItemGridResourceFactory.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/view/FabricItemGridResourceFactory.java index 20807aefc..510bfd152 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/view/FabricItemGridResourceFactory.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/view/FabricItemGridResourceFactory.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.fabric.grid.view; +package com.refinedmods.refinedstorage.fabric.grid.view; -import com.refinedmods.refinedstorage.platform.common.grid.view.AbstractItemGridResourceFactory; +import com.refinedmods.refinedstorage.common.grid.view.AbstractItemGridResourceFactory; import java.util.Optional; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/view/package-info.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/view/package-info.java new file mode 100644 index 000000000..208ed15fc --- /dev/null +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/view/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.fabric.grid.view; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/FabricStorageImporterSource.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/FabricStorageImporterSource.java similarity index 90% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/FabricStorageImporterSource.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/FabricStorageImporterSource.java index ce716f89f..968937d65 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/FabricStorageImporterSource.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/FabricStorageImporterSource.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.fabric.importer; +package com.refinedmods.refinedstorage.fabric.importer; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterSource; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.fabric.storage.FabricStorageExtractableStorage; -import com.refinedmods.refinedstorage.platform.fabric.storage.FabricStorageInsertableStorage; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.fabric.storage.FabricStorageExtractableStorage; +import com.refinedmods.refinedstorage.fabric.storage.FabricStorageInsertableStorage; import java.util.Collections; import java.util.Iterator; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/FabricStorageImporterTransferStrategyFactory.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/FabricStorageImporterTransferStrategyFactory.java similarity index 86% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/FabricStorageImporterTransferStrategyFactory.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/FabricStorageImporterTransferStrategyFactory.java index dd30ebd6f..f20649ae3 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/FabricStorageImporterTransferStrategyFactory.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/FabricStorageImporterTransferStrategyFactory.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.fabric.importer; +package com.refinedmods.refinedstorage.fabric.importer; import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterSource; import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterTransferStrategyImpl; import com.refinedmods.refinedstorage.api.network.node.importer.ImporterTransferStrategy; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.api.importer.ImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.importer.ImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.common.content.Items; import java.util.function.Function; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/package-info.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/package-info.java new file mode 100644 index 000000000..c8b200d74 --- /dev/null +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.fabric.importer; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/AbstractModelBakerImplMixin.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/mixin/AbstractModelBakerImplMixin.java similarity index 86% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/AbstractModelBakerImplMixin.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/mixin/AbstractModelBakerImplMixin.java index 25846afc7..a0f0b3ca3 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/AbstractModelBakerImplMixin.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/mixin/AbstractModelBakerImplMixin.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.fabric.mixin; +package com.refinedmods.refinedstorage.fabric.mixin; -import com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil; -import com.refinedmods.refinedstorage.platform.fabric.support.render.EmissiveModelRegistry; +import com.refinedmods.refinedstorage.common.util.IdentifierUtil; +import com.refinedmods.refinedstorage.fabric.support.render.EmissiveModelRegistry; import net.minecraft.client.renderer.block.model.BlockModel; import net.minecraft.client.resources.model.BakedModel; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/EditBoxAccessor.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/mixin/EditBoxAccessor.java similarity index 81% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/EditBoxAccessor.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/mixin/EditBoxAccessor.java index 6762f6ad8..53130a198 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/EditBoxAccessor.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/mixin/EditBoxAccessor.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.fabric.mixin; +package com.refinedmods.refinedstorage.fabric.mixin; import net.minecraft.client.gui.components.EditBox; import org.spongepowered.asm.mixin.Mixin; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/ItemPropertiesAccessor.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/mixin/ItemPropertiesAccessor.java similarity index 89% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/ItemPropertiesAccessor.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/mixin/ItemPropertiesAccessor.java index 960690ccc..485e304b3 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/ItemPropertiesAccessor.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/mixin/ItemPropertiesAccessor.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.fabric.mixin; +package com.refinedmods.refinedstorage.fabric.mixin; import net.minecraft.client.renderer.item.ClampedItemPropertyFunction; import net.minecraft.client.renderer.item.ItemProperties; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/KeyMappingAccessor.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/mixin/KeyMappingAccessor.java similarity index 83% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/KeyMappingAccessor.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/mixin/KeyMappingAccessor.java index e2f156577..00438427a 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/KeyMappingAccessor.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/mixin/KeyMappingAccessor.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.fabric.mixin; +package com.refinedmods.refinedstorage.fabric.mixin; import com.mojang.blaze3d.platform.InputConstants; import net.minecraft.client.KeyMapping; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/ModelBakeryAccessor.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/mixin/ModelBakeryAccessor.java similarity index 86% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/ModelBakeryAccessor.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/mixin/ModelBakeryAccessor.java index d1b188ad2..f9f3cc161 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/ModelBakeryAccessor.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/mixin/ModelBakeryAccessor.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.fabric.mixin; +package com.refinedmods.refinedstorage.fabric.mixin; import java.util.Map; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/mixin/package-info.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/mixin/package-info.java new file mode 100644 index 000000000..713409b05 --- /dev/null +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/mixin/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.fabric.mixin; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/modmenu/ModMenuApiImpl.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/modmenu/ModMenuApiImpl.java similarity index 78% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/modmenu/ModMenuApiImpl.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/modmenu/ModMenuApiImpl.java index b5b032811..bb16679c8 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/modmenu/ModMenuApiImpl.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/modmenu/ModMenuApiImpl.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.fabric.modmenu; +package com.refinedmods.refinedstorage.fabric.modmenu; -import com.refinedmods.refinedstorage.platform.fabric.ConfigImpl; +import com.refinedmods.refinedstorage.fabric.ConfigImpl; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/modmenu/package-info.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/modmenu/package-info.java new file mode 100644 index 000000000..77fbdbdfd --- /dev/null +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/modmenu/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.fabric.modmenu; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/package-info.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/package-info.java new file mode 100644 index 000000000..b4501e1d2 --- /dev/null +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.fabric; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/security/NetworkNodeBreakSecurityEventListener.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/security/NetworkNodeBreakSecurityEventListener.java similarity index 79% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/security/NetworkNodeBreakSecurityEventListener.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/security/NetworkNodeBreakSecurityEventListener.java index 3b51cdff8..9a2a8a586 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/security/NetworkNodeBreakSecurityEventListener.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/security/NetworkNodeBreakSecurityEventListener.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.fabric.security; +package com.refinedmods.refinedstorage.fabric.security; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.network.NetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerBlockEntity; import javax.annotation.Nullable; @@ -13,7 +13,7 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; public class NetworkNodeBreakSecurityEventListener implements PlayerBlockBreakEvents.Before { @Override diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/security/package-info.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/security/package-info.java new file mode 100644 index 000000000..4e2b9342b --- /dev/null +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/security/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.fabric.security; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/AbstractDiskContainerBakedModel.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/AbstractDiskContainerBakedModel.java similarity index 94% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/AbstractDiskContainerBakedModel.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/AbstractDiskContainerBakedModel.java index ff40801cf..eab952169 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/AbstractDiskContainerBakedModel.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/AbstractDiskContainerBakedModel.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.fabric.storage; +package com.refinedmods.refinedstorage.fabric.storage; import com.refinedmods.refinedstorage.api.storage.StorageState; -import com.refinedmods.refinedstorage.platform.common.storage.AbstractDiskContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadTranslator; +import com.refinedmods.refinedstorage.common.storage.AbstractDiskContainerBlockEntity; +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.fabric.support.render.QuadTranslator; import java.util.Map; import java.util.function.Supplier; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageExtractableStorage.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/FabricStorageExtractableStorage.java similarity index 95% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageExtractableStorage.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/FabricStorageExtractableStorage.java index ad0c0839f..1082f724c 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageExtractableStorage.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/FabricStorageExtractableStorage.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.fabric.storage; +package com.refinedmods.refinedstorage.fabric.storage; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; import java.util.function.Function; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageInsertableStorage.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/FabricStorageInsertableStorage.java similarity index 95% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageInsertableStorage.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/FabricStorageInsertableStorage.java index f5c3cb9ee..0b308333c 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageInsertableStorage.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/FabricStorageInsertableStorage.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.fabric.storage; +package com.refinedmods.refinedstorage.fabric.storage; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; import java.util.function.Function; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageUtil.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/FabricStorageUtil.java similarity index 90% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageUtil.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/FabricStorageUtil.java index 1a5a2b244..56dc3c14a 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageUtil.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/FabricStorageUtil.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.fabric.storage; +package com.refinedmods.refinedstorage.fabric.storage; import net.fabricmc.fabric.api.transfer.v1.storage.Storage; import net.fabricmc.fabric.api.transfer.v1.storage.StorageView; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/DiskDriveBakedModel.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskdrive/DiskDriveBakedModel.java similarity index 83% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/DiskDriveBakedModel.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskdrive/DiskDriveBakedModel.java index 27d1dfa92..9b7776cae 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/DiskDriveBakedModel.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskdrive/DiskDriveBakedModel.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.fabric.storage.diskdrive; +package com.refinedmods.refinedstorage.fabric.storage.diskdrive; -import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.DiskDriveBlock; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage.platform.fabric.storage.AbstractDiskContainerBakedModel; -import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadRotators; -import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadTranslator; +import com.refinedmods.refinedstorage.common.storage.diskdrive.DiskDriveBlock; +import com.refinedmods.refinedstorage.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.fabric.storage.AbstractDiskContainerBakedModel; +import com.refinedmods.refinedstorage.fabric.support.render.QuadRotators; +import com.refinedmods.refinedstorage.fabric.support.render.QuadTranslator; import java.util.Map; import java.util.function.Supplier; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java similarity index 57% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java index 299cf29d7..29bb5b434 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.fabric.storage.diskdrive; +package com.refinedmods.refinedstorage.fabric.storage.diskdrive; -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntityRenderer; -import com.refinedmods.refinedstorage.platform.fabric.support.render.RenderTypes; +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.common.storage.diskdrive.AbstractDiskDriveBlockEntity; +import com.refinedmods.refinedstorage.common.storage.diskdrive.AbstractDiskDriveBlockEntityRenderer; +import com.refinedmods.refinedstorage.fabric.support.render.RenderTypes; public class DiskDriveBlockEntityRendererImpl extends AbstractDiskDriveBlockEntityRenderer { diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/DiskDriveUnbakedModel.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskdrive/DiskDriveUnbakedModel.java similarity index 89% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/DiskDriveUnbakedModel.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskdrive/DiskDriveUnbakedModel.java index fc8a0e901..243122d0b 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/DiskDriveUnbakedModel.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskdrive/DiskDriveUnbakedModel.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.fabric.storage.diskdrive; +package com.refinedmods.refinedstorage.fabric.storage.diskdrive; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadRotators; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.fabric.support.render.QuadRotators; import java.util.Collection; import java.util.HashSet; @@ -20,7 +20,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; import static java.util.Objects.requireNonNull; public class DiskDriveUnbakedModel implements UnbakedModel { diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/FabricDiskDriveBlockEntity.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskdrive/FabricDiskDriveBlockEntity.java similarity index 70% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/FabricDiskDriveBlockEntity.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskdrive/FabricDiskDriveBlockEntity.java index a47217bad..a29466d9c 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/FabricDiskDriveBlockEntity.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskdrive/FabricDiskDriveBlockEntity.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.fabric.storage.diskdrive; +package com.refinedmods.refinedstorage.fabric.storage.diskdrive; -import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; +import com.refinedmods.refinedstorage.common.storage.diskdrive.AbstractDiskDriveBlockEntity; import javax.annotation.Nullable; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskdrive/package-info.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskdrive/package-info.java new file mode 100644 index 000000000..190835ac7 --- /dev/null +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskdrive/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.fabric.storage.diskdrive; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/DiskInterfaceBakedModel.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskinterface/DiskInterfaceBakedModel.java similarity index 82% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/DiskInterfaceBakedModel.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskinterface/DiskInterfaceBakedModel.java index 2d00a3bf3..f872a8b12 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/DiskInterfaceBakedModel.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskinterface/DiskInterfaceBakedModel.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.fabric.storage.diskinterface; +package com.refinedmods.refinedstorage.fabric.storage.diskinterface; -import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.DiskInterfaceBlock; -import com.refinedmods.refinedstorage.platform.common.support.AbstractActiveColoredDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage.platform.fabric.storage.AbstractDiskContainerBakedModel; -import com.refinedmods.refinedstorage.platform.fabric.support.render.EmissiveTransform; -import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadRotators; -import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadTranslator; +import com.refinedmods.refinedstorage.common.storage.diskinterface.DiskInterfaceBlock; +import com.refinedmods.refinedstorage.common.support.AbstractActiveColoredDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.fabric.storage.AbstractDiskContainerBakedModel; +import com.refinedmods.refinedstorage.fabric.support.render.EmissiveTransform; +import com.refinedmods.refinedstorage.fabric.support.render.QuadRotators; +import com.refinedmods.refinedstorage.fabric.support.render.QuadTranslator; import java.util.Map; import java.util.Set; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java similarity index 57% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java index 1ad24843d..6f2ca04c9 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.fabric.storage.diskinterface; +package com.refinedmods.refinedstorage.fabric.storage.diskinterface; -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntityRenderer; -import com.refinedmods.refinedstorage.platform.fabric.support.render.RenderTypes; +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.common.storage.diskinterface.AbstractDiskInterfaceBlockEntityRenderer; +import com.refinedmods.refinedstorage.fabric.support.render.RenderTypes; public class DiskInterfaceBlockEntityRendererImpl extends AbstractDiskInterfaceBlockEntityRenderer { diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java similarity index 91% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java index 0fabc5291..058e43ff4 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.fabric.storage.diskinterface; +package com.refinedmods.refinedstorage.fabric.storage.diskinterface; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadRotators; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.fabric.support.render.QuadRotators; import java.util.Collection; import java.util.HashSet; @@ -21,7 +21,7 @@ import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; import static java.util.Objects.requireNonNull; public class DiskInterfaceUnbakedModel implements UnbakedModel { diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/FabricDiskInterfaceBlockEntity.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskinterface/FabricDiskInterfaceBlockEntity.java similarity index 69% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/FabricDiskInterfaceBlockEntity.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskinterface/FabricDiskInterfaceBlockEntity.java index 2be7b792b..17e9efa16 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/FabricDiskInterfaceBlockEntity.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskinterface/FabricDiskInterfaceBlockEntity.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.fabric.storage.diskinterface; +package com.refinedmods.refinedstorage.fabric.storage.diskinterface; -import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; import javax.annotation.Nullable; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskinterface/package-info.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskinterface/package-info.java new file mode 100644 index 000000000..712bc86f2 --- /dev/null +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskinterface/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.fabric.storage.diskinterface; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/externalstorage/FabricStorageExternalStorageProvider.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/externalstorage/FabricStorageExternalStorageProvider.java similarity index 90% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/externalstorage/FabricStorageExternalStorageProvider.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/externalstorage/FabricStorageExternalStorageProvider.java index a6f547dbb..58d8b18e1 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/externalstorage/FabricStorageExternalStorageProvider.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/externalstorage/FabricStorageExternalStorageProvider.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.fabric.storage.externalstorage; +package com.refinedmods.refinedstorage.fabric.storage.externalstorage; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.fabric.storage.FabricStorageExtractableStorage; -import com.refinedmods.refinedstorage.platform.fabric.storage.FabricStorageInsertableStorage; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.fabric.storage.FabricStorageExtractableStorage; +import com.refinedmods.refinedstorage.fabric.storage.FabricStorageInsertableStorage; import java.util.Collections; import java.util.Iterator; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/externalstorage/FabricStoragePlatformExternalStorageProviderFactory.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/externalstorage/FabricStoragePlatformExternalStorageProviderFactory.java similarity index 89% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/externalstorage/FabricStoragePlatformExternalStorageProviderFactory.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/externalstorage/FabricStoragePlatformExternalStorageProviderFactory.java index 35239e7e6..825cbdec2 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/externalstorage/FabricStoragePlatformExternalStorageProviderFactory.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/externalstorage/FabricStoragePlatformExternalStorageProviderFactory.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.fabric.storage.externalstorage; +package com.refinedmods.refinedstorage.fabric.storage.externalstorage; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; -import com.refinedmods.refinedstorage.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.common.api.storage.externalstorage.PlatformExternalStorageProviderFactory; import java.util.Optional; import java.util.function.Function; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/externalstorage/package-info.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/externalstorage/package-info.java new file mode 100644 index 000000000..865b95a4d --- /dev/null +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/externalstorage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.fabric.storage.externalstorage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/package-info.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/package-info.java new file mode 100644 index 000000000..84079f368 --- /dev/null +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.fabric.storage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/DiskLeds.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/DiskLeds.java similarity index 87% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/DiskLeds.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/DiskLeds.java index 8f9ed1861..bccceb4b6 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/DiskLeds.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/DiskLeds.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.fabric.storage.portablegrid; +package com.refinedmods.refinedstorage.fabric.storage.portablegrid; import com.refinedmods.refinedstorage.api.storage.StorageState; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/FabricPortableGridBlockEntity.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/FabricPortableGridBlockEntity.java similarity index 62% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/FabricPortableGridBlockEntity.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/FabricPortableGridBlockEntity.java index 747cad571..e13319284 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/FabricPortableGridBlockEntity.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/FabricPortableGridBlockEntity.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.fabric.storage.portablegrid; +package com.refinedmods.refinedstorage.fabric.storage.portablegrid; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridType; +import com.refinedmods.refinedstorage.common.storage.portablegrid.AbstractPortableGridBlockEntity; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridType; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/PortableGridBakedModel.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/PortableGridBakedModel.java similarity index 87% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/PortableGridBakedModel.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/PortableGridBakedModel.java index a7ee4c67e..12f8a67a7 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/PortableGridBakedModel.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/PortableGridBakedModel.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.fabric.storage.portablegrid; +package com.refinedmods.refinedstorage.fabric.storage.portablegrid; import com.refinedmods.refinedstorage.api.storage.StorageState; -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlock; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlockItem; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlockItemRenderInfo; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadRotators; -import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadTranslator; +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridBlock; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridBlockItem; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridBlockItemRenderInfo; +import com.refinedmods.refinedstorage.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.fabric.support.render.QuadRotators; +import com.refinedmods.refinedstorage.fabric.support.render.QuadTranslator; import java.util.Map; import java.util.function.Supplier; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/PortableGridBlockEntityRendererImpl.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/PortableGridBlockEntityRendererImpl.java similarity index 58% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/PortableGridBlockEntityRendererImpl.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/PortableGridBlockEntityRendererImpl.java index 474759349..5616bdcff 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/PortableGridBlockEntityRendererImpl.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/PortableGridBlockEntityRendererImpl.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.fabric.storage.portablegrid; +package com.refinedmods.refinedstorage.fabric.storage.portablegrid; -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.AbstractPortableGridBlockEntityRenderer; -import com.refinedmods.refinedstorage.platform.fabric.support.render.RenderTypes; +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.common.storage.portablegrid.AbstractPortableGridBlockEntity; +import com.refinedmods.refinedstorage.common.storage.portablegrid.AbstractPortableGridBlockEntityRenderer; +import com.refinedmods.refinedstorage.fabric.support.render.RenderTypes; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/PortableGridUnbakedModel.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/PortableGridUnbakedModel.java similarity index 91% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/PortableGridUnbakedModel.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/PortableGridUnbakedModel.java index f3e2b957b..9758e7396 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/PortableGridUnbakedModel.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/PortableGridUnbakedModel.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.fabric.storage.portablegrid; +package com.refinedmods.refinedstorage.fabric.storage.portablegrid; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadRotators; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.fabric.support.render.QuadRotators; import java.util.Collection; import java.util.Map; @@ -18,7 +18,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; import static java.util.Objects.requireNonNull; public class PortableGridUnbakedModel implements UnbakedModel { diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/package-info.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/package-info.java new file mode 100644 index 000000000..9da0baec7 --- /dev/null +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.fabric.storage.portablegrid; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/ContainerTransferDestination.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/containermenu/ContainerTransferDestination.java similarity index 85% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/ContainerTransferDestination.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/containermenu/ContainerTransferDestination.java index 3ff564cc6..627c5c16c 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/ContainerTransferDestination.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/containermenu/ContainerTransferDestination.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.fabric.support.containermenu; +package com.refinedmods.refinedstorage.fabric.support.containermenu; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferDestination; +import com.refinedmods.refinedstorage.common.support.containermenu.TransferDestination; import net.fabricmc.fabric.api.transfer.v1.item.InventoryStorage; import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/MenuOpenerImpl.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/containermenu/MenuOpenerImpl.java similarity index 85% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/MenuOpenerImpl.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/containermenu/MenuOpenerImpl.java index f5c409c30..aab2e7b40 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/MenuOpenerImpl.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/containermenu/MenuOpenerImpl.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.fabric.support.containermenu; +package com.refinedmods.refinedstorage.fabric.support.containermenu; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ExtendedMenuProvider; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.MenuOpener; +import com.refinedmods.refinedstorage.common.support.containermenu.ExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.support.containermenu.MenuOpener; import javax.annotation.Nullable; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/containermenu/package-info.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/containermenu/package-info.java new file mode 100644 index 000000000..75a38e159 --- /dev/null +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/containermenu/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.fabric.support.containermenu; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/energy/EnergyStorageAdapter.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/energy/EnergyStorageAdapter.java similarity index 96% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/energy/EnergyStorageAdapter.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/energy/EnergyStorageAdapter.java index 94d34567f..c0215c518 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/energy/EnergyStorageAdapter.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/energy/EnergyStorageAdapter.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.fabric.support.energy; +package com.refinedmods.refinedstorage.fabric.support.energy; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/energy/package-info.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/energy/package-info.java new file mode 100644 index 000000000..a7a75169f --- /dev/null +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/energy/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.fabric.support.energy; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveBakedModel.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/EmissiveBakedModel.java similarity index 96% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveBakedModel.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/EmissiveBakedModel.java index 1cb81cae8..79c153be6 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveBakedModel.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/EmissiveBakedModel.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.fabric.support.render; +package com.refinedmods.refinedstorage.fabric.support.render; import java.util.Set; import java.util.function.Supplier; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveModelRegistry.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/EmissiveModelRegistry.java similarity index 95% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveModelRegistry.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/EmissiveModelRegistry.java index c08392308..f56899ce7 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveModelRegistry.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/EmissiveModelRegistry.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.fabric.support.render; +package com.refinedmods.refinedstorage.fabric.support.render; import java.util.Arrays; import java.util.HashMap; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveTransform.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/EmissiveTransform.java similarity index 96% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveTransform.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/EmissiveTransform.java index 7f202de27..64785b8f9 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveTransform.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/EmissiveTransform.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.fabric.support.render; +package com.refinedmods.refinedstorage.fabric.support.render; import java.util.Set; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/FluidVariantFluidRenderer.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/FluidVariantFluidRenderer.java similarity index 88% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/FluidVariantFluidRenderer.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/FluidVariantFluidRenderer.java index dc2edf238..c8613f2ee 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/FluidVariantFluidRenderer.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/FluidVariantFluidRenderer.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.fabric.support.render; +package com.refinedmods.refinedstorage.fabric.support.render; -import com.refinedmods.refinedstorage.platform.common.support.render.AbstractFluidRenderer; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil; +import com.refinedmods.refinedstorage.common.support.render.AbstractFluidRenderer; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.fabric.support.resource.VariantUtil; import java.util.HashMap; import java.util.List; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadRotator.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/QuadRotator.java similarity index 92% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadRotator.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/QuadRotator.java index 0748b28cb..d8da63fb0 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadRotator.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/QuadRotator.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.fabric.support.render; +package com.refinedmods.refinedstorage.fabric.support.render; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.common.support.direction.BiDirection; import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadRotators.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/QuadRotators.java similarity index 74% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadRotators.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/QuadRotators.java index 45bc35d83..86bfcd4c4 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadRotators.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/QuadRotators.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.fabric.support.render; +package com.refinedmods.refinedstorage.fabric.support.render; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.common.support.direction.BiDirection; import java.util.EnumMap; import java.util.Map; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadTranslator.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/QuadTranslator.java similarity index 91% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadTranslator.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/QuadTranslator.java index f812b092a..d1dd08402 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadTranslator.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/QuadTranslator.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.fabric.support.render; +package com.refinedmods.refinedstorage.fabric.support.render; import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/RenderTypes.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/RenderTypes.java similarity index 91% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/RenderTypes.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/RenderTypes.java index f022cd712..4a2d9b9e3 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/RenderTypes.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/RenderTypes.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.fabric.support.render; +package com.refinedmods.refinedstorage.fabric.support.render; import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.VertexFormat; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/package-info.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/package-info.java new file mode 100644 index 000000000..9cf9ced05 --- /dev/null +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/render/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.fabric.support.render; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/ResourceContainerFluidStorageAdapter.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/resource/ResourceContainerFluidStorageAdapter.java similarity index 89% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/ResourceContainerFluidStorageAdapter.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/resource/ResourceContainerFluidStorageAdapter.java index 9f8805e47..ab9b06a3e 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/ResourceContainerFluidStorageAdapter.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/resource/ResourceContainerFluidStorageAdapter.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.fabric.support.resource; +package com.refinedmods.refinedstorage.fabric.support.resource; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; import java.util.ArrayList; import java.util.Iterator; @@ -18,8 +18,8 @@ import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext; import net.fabricmc.fabric.api.transfer.v1.transaction.base.SnapshotParticipant; -import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.ofFluidVariant; -import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.toFluidVariant; +import static com.refinedmods.refinedstorage.fabric.support.resource.VariantUtil.ofFluidVariant; +import static com.refinedmods.refinedstorage.fabric.support.resource.VariantUtil.toFluidVariant; public class ResourceContainerFluidStorageAdapter extends SnapshotParticipant implements Storage { diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/VariantUtil.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/resource/VariantUtil.java similarity index 78% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/VariantUtil.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/resource/VariantUtil.java index 3b08f6428..7e5e5f452 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/VariantUtil.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/resource/VariantUtil.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.fabric.support.resource; +package com.refinedmods.refinedstorage.fabric.support.resource; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/resource/package-info.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/resource/package-info.java new file mode 100644 index 000000000..3bce09478 --- /dev/null +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/support/resource/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.fabric.support.resource; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/util/SimpleSingleStackStorage.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/util/SimpleSingleStackStorage.java similarity index 91% rename from refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/util/SimpleSingleStackStorage.java rename to refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/util/SimpleSingleStackStorage.java index cebb1af3d..73b1513a7 100644 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/util/SimpleSingleStackStorage.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/util/SimpleSingleStackStorage.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.fabric.util; +package com.refinedmods.refinedstorage.fabric.util; import net.fabricmc.fabric.api.transfer.v1.item.base.SingleStackStorage; import net.minecraft.world.item.ItemStack; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/util/package-info.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/util/package-info.java new file mode 100644 index 000000000..24f3da565 --- /dev/null +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/util/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.fabric.util; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/resources/fabric.mod.json b/refinedstorage-fabric/src/main/resources/fabric.mod.json similarity index 83% rename from refinedstorage-platform-fabric/src/main/resources/fabric.mod.json rename to refinedstorage-fabric/src/main/resources/fabric.mod.json index f2599ada8..dfc5a06b2 100644 --- a/refinedstorage-platform-fabric/src/main/resources/fabric.mod.json +++ b/refinedstorage-fabric/src/main/resources/fabric.mod.json @@ -17,13 +17,13 @@ "environment": "*", "entrypoints": { "main": [ - "com.refinedmods.refinedstorage.platform.fabric.ModInitializerImpl" + "com.refinedmods.refinedstorage.fabric.ModInitializerImpl" ], "client": [ - "com.refinedmods.refinedstorage.platform.fabric.ClientModInitializerImpl" + "com.refinedmods.refinedstorage.fabric.ClientModInitializerImpl" ], "modmenu": [ - "com.refinedmods.refinedstorage.platform.fabric.modmenu.ModMenuApiImpl" + "com.refinedmods.refinedstorage.fabric.modmenu.ModMenuApiImpl" ] }, "custom": { diff --git a/refinedstorage-platform-fabric/src/main/resources/refinedstorage.accesswidener b/refinedstorage-fabric/src/main/resources/refinedstorage.accesswidener similarity index 100% rename from refinedstorage-platform-fabric/src/main/resources/refinedstorage.accesswidener rename to refinedstorage-fabric/src/main/resources/refinedstorage.accesswidener diff --git a/refinedstorage-fabric/src/main/resources/refinedstorage.mixins.json b/refinedstorage-fabric/src/main/resources/refinedstorage.mixins.json new file mode 100644 index 000000000..56ed7ac06 --- /dev/null +++ b/refinedstorage-fabric/src/main/resources/refinedstorage.mixins.json @@ -0,0 +1,16 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "com.refinedmods.refinedstorage.platform.fabric.mixin", + "compatibilityLevel": "JAVA_17", + "client": [ + "com.refinedmods.refinedstorage.fabric.mixin.AbstractModelBakerImplMixin", + "com.refinedmods.refinedstorage.fabric.mixin.EditBoxAccessor", + "com.refinedmods.refinedstorage.fabric.mixin.ItemPropertiesAccessor", + "com.refinedmods.refinedstorage.fabric.mixin.KeyMappingAccessor", + "com.refinedmods.refinedstorage.fabric.mixin.ModelBakeryAccessor" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/GridOperationsImplTest.java b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/GridOperationsImplTest.java index 260bbc6da..5bb3bb0fc 100644 --- a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/GridOperationsImplTest.java +++ b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/GridOperationsImplTest.java @@ -41,7 +41,7 @@ void setUp() { class InsertTest { @ParameterizedTest @EnumSource(GridInsertMode.class) - @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug + @SuppressWarnings("AssertBetweenInconvertibleTypes") void shouldInsertIntoDestination(final GridInsertMode insertMode) { // Arrange final Storage source = new LimitedStorageImpl(100); @@ -121,7 +121,7 @@ void shouldNotInsertIntoDestinationWhenNoSpaceIsPresentInDestination(final GridI @Nested class InsertEntireResourceTest { @Test - @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug + @SuppressWarnings("AssertBetweenInconvertibleTypes") void shouldInsertIntoDestinationWithRemainder() { // Arrange final Storage source = new LimitedStorageImpl(100); @@ -194,7 +194,7 @@ public long extract(final ResourceKey resource, class ExtractTest { @ParameterizedTest @EnumSource(GridExtractMode.class) - @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug + @SuppressWarnings("AssertBetweenInconvertibleTypes") void shouldExtractFromSourceToDestination(final GridExtractMode extractMode) { // Arrange final Storage destination = new LimitedStorageImpl(100); @@ -275,7 +275,7 @@ void shouldNotExtractFromSourceIfThereIsNoSpaceInDestination(final GridExtractMo @Nested class ExtractEntireResourceTest { @Test - @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug + @SuppressWarnings("AssertBetweenInconvertibleTypes") void shouldExtractEntireResourceFromSourceToDestinationIfResourceIsLessThanMaxCount() { // Arrange final Storage destination = new LimitedStorageImpl(100); @@ -300,7 +300,7 @@ void shouldExtractEntireResourceFromSourceToDestinationIfResourceIsLessThanMaxCo } @Test - @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug + @SuppressWarnings("AssertBetweenInconvertibleTypes") void shouldExtractEntireResourceWithRemainderFromSourceToDestinationIfThereIsNotEnoughSpaceInDestination() { // Arrange final Storage destination = new LimitedStorageImpl(MAX_COUNT - 1); @@ -330,7 +330,7 @@ void shouldExtractEntireResourceWithRemainderFromSourceToDestinationIfThereIsNot @Nested class ExtractHalfResourceTest { @Test - @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug + @SuppressWarnings("AssertBetweenInconvertibleTypes") void shouldExtractSingleAmountIfResourceHasSingleAmountWhenExtractingHalfResourceFromSourceToDestination() { // Arrange final Storage destination = new LimitedStorageImpl(MAX_COUNT); diff --git a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImplTest.java b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImplTest.java index 3c3c52029..2837dd328 100644 --- a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImplTest.java +++ b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImplTest.java @@ -94,7 +94,7 @@ void shouldPreserveOrderWhenSortingAndTwoResourcesHaveTheSameQuantity() { } @Test - @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug + @SuppressWarnings("AssertBetweenInconvertibleTypes") void shouldLoadResourcesAndRetrieveTrackedResourcesProperly() { // Arrange final GridView view = viewBuilder @@ -347,7 +347,7 @@ void shouldNotReorderExistingResourceWhenPreventingSorting() { } @Test - @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug + @SuppressWarnings("AssertBetweenInconvertibleTypes") void shouldUpdateTrackedResourceAfterReceivingChange() { // Act final GridView view = viewBuilder.build(); diff --git a/refinedstorage-platform-neoforge/build.gradle.kts b/refinedstorage-neoforge/build.gradle.kts similarity index 73% rename from refinedstorage-platform-neoforge/build.gradle.kts rename to refinedstorage-neoforge/build.gradle.kts index 6d66e6a37..846e7171e 100644 --- a/refinedstorage-platform-neoforge/build.gradle.kts +++ b/refinedstorage-neoforge/build.gradle.kts @@ -6,9 +6,9 @@ refinedarchitect { modId = "refinedstorage" neoForge() gameTests() - dataGeneration(project(":refinedstorage-platform-common")) - compileWithProject(project(":refinedstorage-platform-common")) - compileWithProject(project(":refinedstorage-platform-api")) + dataGeneration(project(":refinedstorage-common")) + compileWithProject(project(":refinedstorage-common")) + compileWithProject(project(":refinedstorage-common-api")) compileWithProject(project(":refinedstorage-core-api")) compileWithProject(project(":refinedstorage-resource-api")) compileWithProject(project(":refinedstorage-storage-api")) @@ -24,5 +24,5 @@ refinedarchitect { } base { - archivesName.set("refinedstorage-platform-neoforge") + archivesName.set("refinedstorage-neoforge") } diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ClientModInitializer.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ClientModInitializer.java similarity index 75% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ClientModInitializer.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ClientModInitializer.java index 8ddc97359..890eed3b5 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ClientModInitializer.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ClientModInitializer.java @@ -1,31 +1,31 @@ -package com.refinedmods.refinedstorage.platform.neoforge; +package com.refinedmods.refinedstorage.neoforge; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage.platform.api.upgrade.AbstractUpgradeItem; -import com.refinedmods.refinedstorage.platform.common.AbstractClientModInitializer; -import com.refinedmods.refinedstorage.platform.common.configurationcard.ConfigurationCardItemPropertyFunction; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.content.KeyMappings; -import com.refinedmods.refinedstorage.platform.common.controller.ControllerItemPropertyFunction; -import com.refinedmods.refinedstorage.platform.common.networking.NetworkCardItemPropertyFunction; -import com.refinedmods.refinedstorage.platform.common.security.SecurityCardItemPropertyFunction; -import com.refinedmods.refinedstorage.platform.common.storagemonitor.StorageMonitorBlockEntityRenderer; -import com.refinedmods.refinedstorage.platform.common.support.network.bounditem.NetworkBoundItemItemPropertyFunction; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.CompositeClientTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.HelpClientTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.support.tooltip.ResourceClientTooltipComponent; -import com.refinedmods.refinedstorage.platform.common.upgrade.RegulatorUpgradeItem; -import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinationClientTooltipComponent; -import com.refinedmods.refinedstorage.platform.neoforge.storage.diskdrive.DiskDriveBlockEntityRendererImpl; -import com.refinedmods.refinedstorage.platform.neoforge.storage.diskdrive.DiskDriveGeometryLoader; -import com.refinedmods.refinedstorage.platform.neoforge.storage.diskinterface.DiskInterfaceBlockEntityRendererImpl; -import com.refinedmods.refinedstorage.platform.neoforge.storage.diskinterface.DiskInterfaceGeometryLoader; -import com.refinedmods.refinedstorage.platform.neoforge.storage.portablegrid.PortableGridBlockEntityRendererImpl; -import com.refinedmods.refinedstorage.platform.neoforge.storage.portablegrid.PortableGridGeometryLoader; +import com.refinedmods.refinedstorage.common.AbstractClientModInitializer; +import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.common.api.upgrade.AbstractUpgradeItem; +import com.refinedmods.refinedstorage.common.configurationcard.ConfigurationCardItemPropertyFunction; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.common.content.KeyMappings; +import com.refinedmods.refinedstorage.common.controller.ControllerItemPropertyFunction; +import com.refinedmods.refinedstorage.common.networking.NetworkCardItemPropertyFunction; +import com.refinedmods.refinedstorage.common.security.SecurityCardItemPropertyFunction; +import com.refinedmods.refinedstorage.common.storagemonitor.StorageMonitorBlockEntityRenderer; +import com.refinedmods.refinedstorage.common.support.network.bounditem.NetworkBoundItemItemPropertyFunction; +import com.refinedmods.refinedstorage.common.support.tooltip.CompositeClientTooltipComponent; +import com.refinedmods.refinedstorage.common.support.tooltip.HelpClientTooltipComponent; +import com.refinedmods.refinedstorage.common.support.tooltip.ResourceClientTooltipComponent; +import com.refinedmods.refinedstorage.common.upgrade.RegulatorUpgradeItem; +import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinationClientTooltipComponent; +import com.refinedmods.refinedstorage.neoforge.storage.diskdrive.DiskDriveBlockEntityRendererImpl; +import com.refinedmods.refinedstorage.neoforge.storage.diskdrive.DiskDriveGeometryLoader; +import com.refinedmods.refinedstorage.neoforge.storage.diskinterface.DiskInterfaceBlockEntityRendererImpl; +import com.refinedmods.refinedstorage.neoforge.storage.diskinterface.DiskInterfaceGeometryLoader; +import com.refinedmods.refinedstorage.neoforge.storage.portablegrid.PortableGridBlockEntityRendererImpl; +import com.refinedmods.refinedstorage.neoforge.storage.portablegrid.PortableGridGeometryLoader; import java.util.List; @@ -50,9 +50,9 @@ import net.neoforged.neoforge.common.NeoForge; import org.lwjgl.glfw.GLFW; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.DISK_DRIVE; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.PORTABLE_GRID; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.content.ContentIds.DISK_DRIVE; +import static com.refinedmods.refinedstorage.common.content.ContentIds.PORTABLE_GRID; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public final class ClientModInitializer extends AbstractClientModInitializer { private ClientModInitializer() { diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ConfigImpl.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ConfigImpl.java similarity index 98% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ConfigImpl.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ConfigImpl.java index ba59c7d90..9a4322505 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ConfigImpl.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ConfigImpl.java @@ -1,18 +1,18 @@ -package com.refinedmods.refinedstorage.platform.neoforge; +package com.refinedmods.refinedstorage.neoforge; import com.refinedmods.refinedstorage.api.grid.view.GridSortingDirection; -import com.refinedmods.refinedstorage.platform.common.Config; -import com.refinedmods.refinedstorage.platform.common.content.DefaultEnergyUsage; -import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridMatrixCloseBehavior; -import com.refinedmods.refinedstorage.platform.common.grid.GridSortingTypes; -import com.refinedmods.refinedstorage.platform.common.support.stretching.ScreenSize; +import com.refinedmods.refinedstorage.common.Config; +import com.refinedmods.refinedstorage.common.content.DefaultEnergyUsage; +import com.refinedmods.refinedstorage.common.grid.CraftingGridMatrixCloseBehavior; +import com.refinedmods.refinedstorage.common.grid.GridSortingTypes; +import com.refinedmods.refinedstorage.common.support.stretching.ScreenSize; import java.util.Optional; import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.common.ModConfigSpec; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslationKey; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslationKey; public class ConfigImpl implements Config { private static final String ENERGY_USAGE = "energyUsage"; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ModInitializer.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ModInitializer.java similarity index 78% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ModInitializer.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ModInitializer.java index f520edbb1..ac4d243a8 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ModInitializer.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ModInitializer.java @@ -1,71 +1,71 @@ -package com.refinedmods.refinedstorage.platform.neoforge; - -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.support.network.NetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.AbstractModInitializer; -import com.refinedmods.refinedstorage.platform.common.PlatformProxy; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage.platform.common.content.BlockEntityTypeFactory; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage.platform.common.content.CreativeModeTabItems; -import com.refinedmods.refinedstorage.platform.common.content.DirectRegistryCallback; -import com.refinedmods.refinedstorage.platform.common.content.ExtendedMenuTypeFactory; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.content.MenuTypeFactory; -import com.refinedmods.refinedstorage.platform.common.content.RegistryCallback; -import com.refinedmods.refinedstorage.platform.common.grid.WirelessGridItem; -import com.refinedmods.refinedstorage.platform.common.iface.InterfacePlatformExternalStorageProviderFactory; -import com.refinedmods.refinedstorage.platform.common.security.FallbackSecurityCardItem; -import com.refinedmods.refinedstorage.platform.common.security.SecurityCardItem; -import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlockItem; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridType; -import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseBlock; -import com.refinedmods.refinedstorage.platform.common.support.packet.PacketHandler; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.CraftingGridClearPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.CraftingGridRecipeTransferPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.GridExtractPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.GridInsertPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.GridScrollPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.PropertyChangePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.ResourceFilterSlotChangePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.ResourceSlotAmountChangePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.ResourceSlotChangePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.SecurityCardBoundPlayerPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.SecurityCardPermissionPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.SecurityCardResetPermissionPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.SingleAmountChangePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.StorageInfoRequestPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.UseSlotReferencedItemPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.EnergyInfoPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.GridActivePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.GridClearPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.GridUpdatePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.NetworkTransmitterStatusPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.NoPermissionPacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.ResourceSlotUpdatePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.StorageInfoResponsePacket; -import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.WirelessTransmitterRangePacket; -import com.refinedmods.refinedstorage.platform.common.upgrade.RegulatorUpgradeItem; -import com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil; -import com.refinedmods.refinedstorage.platform.common.util.ServerEventQueue; -import com.refinedmods.refinedstorage.platform.neoforge.exporter.FluidHandlerExporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.platform.neoforge.exporter.ItemHandlerExporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.platform.neoforge.grid.strategy.FluidGridExtractionStrategy; -import com.refinedmods.refinedstorage.platform.neoforge.grid.strategy.FluidGridInsertionStrategy; -import com.refinedmods.refinedstorage.platform.neoforge.grid.strategy.ItemGridExtractionStrategy; -import com.refinedmods.refinedstorage.platform.neoforge.grid.strategy.ItemGridScrollingStrategy; -import com.refinedmods.refinedstorage.platform.neoforge.importer.FluidHandlerImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.platform.neoforge.importer.ItemHandlerImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.platform.neoforge.storage.diskdrive.ForgeDiskDriveBlockEntity; -import com.refinedmods.refinedstorage.platform.neoforge.storage.diskinterface.ForgeDiskInterfaceBlockEntity; -import com.refinedmods.refinedstorage.platform.neoforge.storage.externalstorage.FluidHandlerPlatformExternalStorageProviderFactory; -import com.refinedmods.refinedstorage.platform.neoforge.storage.externalstorage.ItemHandlerPlatformExternalStorageProviderFactory; -import com.refinedmods.refinedstorage.platform.neoforge.storage.portablegrid.ForgePortableGridBlockEntity; -import com.refinedmods.refinedstorage.platform.neoforge.support.energy.EnergyStorageAdapter; -import com.refinedmods.refinedstorage.platform.neoforge.support.inventory.InsertExtractItemHandler; -import com.refinedmods.refinedstorage.platform.neoforge.support.resource.ResourceContainerFluidHandlerAdapter; +package com.refinedmods.refinedstorage.neoforge; + +import com.refinedmods.refinedstorage.common.AbstractModInitializer; +import com.refinedmods.refinedstorage.common.PlatformProxy; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.content.BlockEntities; +import com.refinedmods.refinedstorage.common.content.BlockEntityTypeFactory; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.content.ContentNames; +import com.refinedmods.refinedstorage.common.content.CreativeModeTabItems; +import com.refinedmods.refinedstorage.common.content.DirectRegistryCallback; +import com.refinedmods.refinedstorage.common.content.ExtendedMenuTypeFactory; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.common.content.MenuTypeFactory; +import com.refinedmods.refinedstorage.common.content.RegistryCallback; +import com.refinedmods.refinedstorage.common.grid.WirelessGridItem; +import com.refinedmods.refinedstorage.common.iface.InterfacePlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.common.security.FallbackSecurityCardItem; +import com.refinedmods.refinedstorage.common.security.SecurityCardItem; +import com.refinedmods.refinedstorage.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridBlockItem; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridType; +import com.refinedmods.refinedstorage.common.support.AbstractBaseBlock; +import com.refinedmods.refinedstorage.common.support.packet.PacketHandler; +import com.refinedmods.refinedstorage.common.support.packet.c2s.CraftingGridClearPacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.CraftingGridRecipeTransferPacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.GridExtractPacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.GridInsertPacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.GridScrollPacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.PropertyChangePacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.ResourceFilterSlotChangePacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.ResourceSlotAmountChangePacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.ResourceSlotChangePacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.SecurityCardBoundPlayerPacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.SecurityCardPermissionPacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.SecurityCardResetPermissionPacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.SingleAmountChangePacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.StorageInfoRequestPacket; +import com.refinedmods.refinedstorage.common.support.packet.c2s.UseSlotReferencedItemPacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.EnergyInfoPacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.GridActivePacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.GridClearPacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.GridUpdatePacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.NetworkTransmitterStatusPacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.NoPermissionPacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.ResourceSlotUpdatePacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.StorageInfoResponsePacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.WirelessTransmitterRangePacket; +import com.refinedmods.refinedstorage.common.upgrade.RegulatorUpgradeItem; +import com.refinedmods.refinedstorage.common.util.IdentifierUtil; +import com.refinedmods.refinedstorage.common.util.ServerEventQueue; +import com.refinedmods.refinedstorage.neoforge.exporter.FluidHandlerExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.neoforge.exporter.ItemHandlerExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.neoforge.grid.strategy.FluidGridExtractionStrategy; +import com.refinedmods.refinedstorage.neoforge.grid.strategy.FluidGridInsertionStrategy; +import com.refinedmods.refinedstorage.neoforge.grid.strategy.ItemGridExtractionStrategy; +import com.refinedmods.refinedstorage.neoforge.grid.strategy.ItemGridScrollingStrategy; +import com.refinedmods.refinedstorage.neoforge.importer.FluidHandlerImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.neoforge.importer.ItemHandlerImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.neoforge.storage.diskdrive.ForgeDiskDriveBlockEntity; +import com.refinedmods.refinedstorage.neoforge.storage.diskinterface.ForgeDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.neoforge.storage.externalstorage.FluidHandlerPlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.neoforge.storage.externalstorage.ItemHandlerPlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.neoforge.storage.portablegrid.ForgePortableGridBlockEntity; +import com.refinedmods.refinedstorage.neoforge.support.energy.EnergyStorageAdapter; +import com.refinedmods.refinedstorage.neoforge.support.inventory.InsertExtractItemHandler; +import com.refinedmods.refinedstorage.neoforge.support.resource.ResourceContainerFluidHandlerAdapter; import java.util.Arrays; import java.util.HashSet; @@ -116,16 +116,16 @@ import net.neoforged.neoforge.registries.DeferredRegister; import net.neoforged.neoforge.registries.RegisterEvent; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CREATIVE_PORTABLE_GRID; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CREATIVE_WIRELESS_GRID; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.FALLBACK_SECURITY_CARD; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.PORTABLE_GRID; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.REGULATOR_UPGRADE; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.SECURITY_CARD; -import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.WIRELESS_GRID; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.MOD_ID; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.common.content.ContentIds.CREATIVE_PORTABLE_GRID; +import static com.refinedmods.refinedstorage.common.content.ContentIds.CREATIVE_WIRELESS_GRID; +import static com.refinedmods.refinedstorage.common.content.ContentIds.FALLBACK_SECURITY_CARD; +import static com.refinedmods.refinedstorage.common.content.ContentIds.PORTABLE_GRID; +import static com.refinedmods.refinedstorage.common.content.ContentIds.REGULATOR_UPGRADE; +import static com.refinedmods.refinedstorage.common.content.ContentIds.SECURITY_CARD; +import static com.refinedmods.refinedstorage.common.content.ContentIds.WIRELESS_GRID; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.MOD_ID; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; @Mod(IdentifierUtil.MOD_ID) public class ModInitializer extends AbstractModInitializer { diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/PlatformImpl.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/PlatformImpl.java similarity index 89% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/PlatformImpl.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/PlatformImpl.java index abbcd4db3..746d1c9b3 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/PlatformImpl.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/PlatformImpl.java @@ -1,23 +1,23 @@ -package com.refinedmods.refinedstorage.platform.neoforge; +package com.refinedmods.refinedstorage.neoforge; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.platform.api.support.resource.FluidOperationResult; -import com.refinedmods.refinedstorage.platform.common.AbstractPlatform; -import com.refinedmods.refinedstorage.platform.common.Config; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferManager; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage.platform.common.util.CustomBlockPlaceContext; -import com.refinedmods.refinedstorage.platform.neoforge.grid.strategy.ItemGridInsertionStrategy; -import com.refinedmods.refinedstorage.platform.neoforge.grid.view.ForgeFluidGridResourceFactory; -import com.refinedmods.refinedstorage.platform.neoforge.grid.view.ForgeItemGridResourceFactory; -import com.refinedmods.refinedstorage.platform.neoforge.support.containermenu.ContainerTransferDestination; -import com.refinedmods.refinedstorage.platform.neoforge.support.containermenu.MenuOpenerImpl; -import com.refinedmods.refinedstorage.platform.neoforge.support.energy.EnergyStorageAdapter; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.FluidStackFluidRenderer; +import com.refinedmods.refinedstorage.common.AbstractPlatform; +import com.refinedmods.refinedstorage.common.Config; +import com.refinedmods.refinedstorage.common.api.support.resource.FluidOperationResult; +import com.refinedmods.refinedstorage.common.support.containermenu.TransferManager; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.util.CustomBlockPlaceContext; +import com.refinedmods.refinedstorage.neoforge.grid.strategy.ItemGridInsertionStrategy; +import com.refinedmods.refinedstorage.neoforge.grid.view.ForgeFluidGridResourceFactory; +import com.refinedmods.refinedstorage.neoforge.grid.view.ForgeItemGridResourceFactory; +import com.refinedmods.refinedstorage.neoforge.support.containermenu.ContainerTransferDestination; +import com.refinedmods.refinedstorage.neoforge.support.containermenu.MenuOpenerImpl; +import com.refinedmods.refinedstorage.neoforge.support.energy.EnergyStorageAdapter; +import com.refinedmods.refinedstorage.neoforge.support.render.FluidStackFluidRenderer; import java.io.File; import java.util.ArrayList; @@ -82,8 +82,8 @@ import net.neoforged.neoforge.items.wrapper.InvWrapper; import net.neoforged.neoforge.network.PacketDistributor; -import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.ofFluidStack; -import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidStack; +import static com.refinedmods.refinedstorage.neoforge.support.resource.VariantUtil.ofFluidStack; +import static com.refinedmods.refinedstorage.neoforge.support.resource.VariantUtil.toFluidStack; public final class PlatformImpl extends AbstractPlatform { private final ConfigImpl config = new ConfigImpl(); diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/BlockModelProviderImpl.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/BlockModelProviderImpl.java similarity index 97% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/BlockModelProviderImpl.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/BlockModelProviderImpl.java index 6c76ba7b6..b605ffb32 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/BlockModelProviderImpl.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/BlockModelProviderImpl.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.neoforge.datagen; +package com.refinedmods.refinedstorage.neoforge.datagen; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.Blocks; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; @@ -9,8 +9,8 @@ import net.neoforged.neoforge.client.model.generators.CustomLoaderBuilder; import net.neoforged.neoforge.common.data.ExistingFileHelper; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.MOD_ID; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.MOD_ID; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public class BlockModelProviderImpl extends BlockModelProvider { private static final String PARTICLE_TEXTURE = "particle"; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/BlockStateProviderImpl.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/BlockStateProviderImpl.java similarity index 92% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/BlockStateProviderImpl.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/BlockStateProviderImpl.java index 00fd6b027..43071d965 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/BlockStateProviderImpl.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/BlockStateProviderImpl.java @@ -1,19 +1,19 @@ -package com.refinedmods.refinedstorage.platform.neoforge.datagen; - -import com.refinedmods.refinedstorage.platform.common.constructordestructor.AbstractConstructorDestructorBlock; -import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.controller.AbstractControllerBlock; -import com.refinedmods.refinedstorage.platform.common.controller.ControllerEnergyType; -import com.refinedmods.refinedstorage.platform.common.detector.DetectorBlock; -import com.refinedmods.refinedstorage.platform.common.networking.NetworkReceiverBlock; -import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterBlock; -import com.refinedmods.refinedstorage.platform.common.support.AbstractActiveColoredDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.CableBlockSupport; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirectionType; -import com.refinedmods.refinedstorage.platform.common.support.direction.DefaultDirectionType; -import com.refinedmods.refinedstorage.platform.common.support.direction.HorizontalDirectionType; +package com.refinedmods.refinedstorage.neoforge.datagen; + +import com.refinedmods.refinedstorage.common.constructordestructor.AbstractConstructorDestructorBlock; +import com.refinedmods.refinedstorage.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.controller.AbstractControllerBlock; +import com.refinedmods.refinedstorage.common.controller.ControllerEnergyType; +import com.refinedmods.refinedstorage.common.detector.DetectorBlock; +import com.refinedmods.refinedstorage.common.networking.NetworkReceiverBlock; +import com.refinedmods.refinedstorage.common.networking.NetworkTransmitterBlock; +import com.refinedmods.refinedstorage.common.support.AbstractActiveColoredDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.CableBlockSupport; +import com.refinedmods.refinedstorage.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.common.support.direction.BiDirectionType; +import com.refinedmods.refinedstorage.common.support.direction.DefaultDirectionType; +import com.refinedmods.refinedstorage.common.support.direction.HorizontalDirectionType; import java.util.EnumMap; import java.util.Map; @@ -32,8 +32,8 @@ import net.neoforged.neoforge.client.model.generators.MultiPartBlockStateBuilder; import net.neoforged.neoforge.common.data.ExistingFileHelper; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.MOD_ID; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.MOD_ID; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public class BlockStateProviderImpl extends BlockStateProvider { private static final String BLOCK_PREFIX = "block"; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/DataGenerators.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/DataGenerators.java similarity index 87% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/DataGenerators.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/DataGenerators.java index cfdac8749..6d8a7990b 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/DataGenerators.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/DataGenerators.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.neoforge.datagen; +package com.refinedmods.refinedstorage.neoforge.datagen; -import com.refinedmods.refinedstorage.platform.neoforge.datagen.loot.LootTableProviderImpl; -import com.refinedmods.refinedstorage.platform.neoforge.datagen.recipe.RecoloringRecipeProvider; -import com.refinedmods.refinedstorage.platform.neoforge.datagen.tag.BlockTagsProvider; -import com.refinedmods.refinedstorage.platform.neoforge.datagen.tag.ItemTagsProviderImpl; +import com.refinedmods.refinedstorage.neoforge.datagen.loot.LootTableProviderImpl; +import com.refinedmods.refinedstorage.neoforge.datagen.recipe.RecoloringRecipeProvider; +import com.refinedmods.refinedstorage.neoforge.datagen.tag.BlockTagsProvider; +import com.refinedmods.refinedstorage.neoforge.datagen.tag.ItemTagsProviderImpl; import java.util.concurrent.CompletableFuture; @@ -15,7 +15,7 @@ import net.neoforged.neoforge.common.data.ExistingFileHelper; import net.neoforged.neoforge.data.event.GatherDataEvent; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.MOD_ID; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.MOD_ID; @EventBusSubscriber(modid = MOD_ID, bus = EventBusSubscriber.Bus.MOD) public class DataGenerators { diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/ItemModelProviderImpl.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/ItemModelProviderImpl.java similarity index 87% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/ItemModelProviderImpl.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/ItemModelProviderImpl.java index e38a0e068..19f52a8ad 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/ItemModelProviderImpl.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/ItemModelProviderImpl.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.neoforge.datagen; - -import com.refinedmods.refinedstorage.platform.common.constructordestructor.ConstructorBlock; -import com.refinedmods.refinedstorage.platform.common.constructordestructor.DestructorBlock; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.content.ColorMap; -import com.refinedmods.refinedstorage.platform.common.exporter.ExporterBlock; -import com.refinedmods.refinedstorage.platform.common.importer.ImporterBlock; -import com.refinedmods.refinedstorage.platform.common.networking.CableBlock; -import com.refinedmods.refinedstorage.platform.common.networking.NetworkReceiverBlock; -import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterBlock; -import com.refinedmods.refinedstorage.platform.common.storage.externalstorage.ExternalStorageBlock; -import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.WirelessTransmitterBlock; +package com.refinedmods.refinedstorage.neoforge.datagen; + +import com.refinedmods.refinedstorage.common.constructordestructor.ConstructorBlock; +import com.refinedmods.refinedstorage.common.constructordestructor.DestructorBlock; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.content.ColorMap; +import com.refinedmods.refinedstorage.common.exporter.ExporterBlock; +import com.refinedmods.refinedstorage.common.importer.ImporterBlock; +import com.refinedmods.refinedstorage.common.networking.CableBlock; +import com.refinedmods.refinedstorage.common.networking.NetworkReceiverBlock; +import com.refinedmods.refinedstorage.common.networking.NetworkTransmitterBlock; +import com.refinedmods.refinedstorage.common.storage.externalstorage.ExternalStorageBlock; +import com.refinedmods.refinedstorage.common.wirelesstransmitter.WirelessTransmitterBlock; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; @@ -20,8 +20,8 @@ import net.neoforged.neoforge.client.model.generators.ModelFile; import net.neoforged.neoforge.common.data.ExistingFileHelper; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.MOD_ID; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.MOD_ID; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public class ItemModelProviderImpl extends ItemModelProvider { private static final String CUTOUT_TEXTURE_KEY = "cutout"; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/loot/BlockDropProvider.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/loot/BlockDropProvider.java similarity index 92% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/loot/BlockDropProvider.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/loot/BlockDropProvider.java index 64ccb7fb2..0a547cf1a 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/loot/BlockDropProvider.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/loot/BlockDropProvider.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.neoforge.datagen.loot; +package com.refinedmods.refinedstorage.neoforge.datagen.loot; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyLootItemFunction; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.support.energy.EnergyLootItemFunction; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/loot/LootTableProviderImpl.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/loot/LootTableProviderImpl.java similarity index 90% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/loot/LootTableProviderImpl.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/loot/LootTableProviderImpl.java index 11103a175..1e39eb705 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/loot/LootTableProviderImpl.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/loot/LootTableProviderImpl.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.neoforge.datagen.loot; +package com.refinedmods.refinedstorage.neoforge.datagen.loot; import java.util.List; import java.util.Set; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/loot/package-info.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/loot/package-info.java new file mode 100644 index 000000000..4e5706c4c --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/loot/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.neoforge.datagen.loot; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/package-info.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/package-info.java new file mode 100644 index 000000000..24407b8a0 --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.neoforge.datagen; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/recipe/RecoloringRecipeProvider.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/recipe/RecoloringRecipeProvider.java similarity index 95% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/recipe/RecoloringRecipeProvider.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/recipe/RecoloringRecipeProvider.java index e3fbe8959..15672a360 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/recipe/RecoloringRecipeProvider.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/recipe/RecoloringRecipeProvider.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.neoforge.datagen.recipe; +package com.refinedmods.refinedstorage.neoforge.datagen.recipe; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.content.Tags; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.content.Tags; import java.util.concurrent.CompletableFuture; @@ -16,7 +16,7 @@ import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; public class RecoloringRecipeProvider extends RecipeProvider { public RecoloringRecipeProvider(final PackOutput output, diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/recipe/package-info.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/recipe/package-info.java new file mode 100644 index 000000000..2807e90d2 --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/recipe/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.neoforge.datagen.recipe; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/BlockTagsProvider.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/tag/BlockTagsProvider.java similarity index 85% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/BlockTagsProvider.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/tag/BlockTagsProvider.java index 8acdeb830..25fec3577 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/BlockTagsProvider.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/tag/BlockTagsProvider.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.neoforge.datagen.tag; +package com.refinedmods.refinedstorage.neoforge.datagen.tag; import java.util.concurrent.CompletableFuture; import javax.annotation.Nullable; @@ -10,7 +10,7 @@ import net.minecraft.world.level.block.Block; import net.neoforged.neoforge.common.data.ExistingFileHelper; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.MOD_ID; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.MOD_ID; public class BlockTagsProvider extends TagsProvider { public BlockTagsProvider(final PackOutput packOutput, diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/ItemTagsProviderImpl.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/tag/ItemTagsProviderImpl.java similarity index 69% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/ItemTagsProviderImpl.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/tag/ItemTagsProviderImpl.java index fe651942a..d9e4687db 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/ItemTagsProviderImpl.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/tag/ItemTagsProviderImpl.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.neoforge.datagen.tag; +package com.refinedmods.refinedstorage.neoforge.datagen.tag; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; -import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.common.storage.ItemStorageVariant; +import com.refinedmods.refinedstorage.common.support.BaseBlockItem; import java.util.Arrays; import java.util.Collection; @@ -20,26 +20,26 @@ import net.minecraft.world.level.block.Block; import net.neoforged.neoforge.common.data.ExistingFileHelper; -import static com.refinedmods.refinedstorage.platform.common.content.Tags.CABLES; -import static com.refinedmods.refinedstorage.platform.common.content.Tags.CONSTRUCTORS; -import static com.refinedmods.refinedstorage.platform.common.content.Tags.CONTROLLERS; -import static com.refinedmods.refinedstorage.platform.common.content.Tags.CRAFTING_GRIDS; -import static com.refinedmods.refinedstorage.platform.common.content.Tags.CREATIVE_CONTROLLERS; -import static com.refinedmods.refinedstorage.platform.common.content.Tags.DESTRUCTORS; -import static com.refinedmods.refinedstorage.platform.common.content.Tags.DETECTORS; -import static com.refinedmods.refinedstorage.platform.common.content.Tags.DISK_INTERFACES; -import static com.refinedmods.refinedstorage.platform.common.content.Tags.EXPORTERS; -import static com.refinedmods.refinedstorage.platform.common.content.Tags.EXTERNAL_STORAGES; -import static com.refinedmods.refinedstorage.platform.common.content.Tags.FLUID_STORAGE_DISKS; -import static com.refinedmods.refinedstorage.platform.common.content.Tags.GRIDS; -import static com.refinedmods.refinedstorage.platform.common.content.Tags.IMPORTERS; -import static com.refinedmods.refinedstorage.platform.common.content.Tags.NETWORK_RECEIVERS; -import static com.refinedmods.refinedstorage.platform.common.content.Tags.NETWORK_TRANSMITTERS; -import static com.refinedmods.refinedstorage.platform.common.content.Tags.RELAYS; -import static com.refinedmods.refinedstorage.platform.common.content.Tags.SECURITY_MANAGERS; -import static com.refinedmods.refinedstorage.platform.common.content.Tags.STORAGE_DISKS; -import static com.refinedmods.refinedstorage.platform.common.content.Tags.WIRELESS_TRANSMITTERS; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.MOD_ID; +import static com.refinedmods.refinedstorage.common.content.Tags.CABLES; +import static com.refinedmods.refinedstorage.common.content.Tags.CONSTRUCTORS; +import static com.refinedmods.refinedstorage.common.content.Tags.CONTROLLERS; +import static com.refinedmods.refinedstorage.common.content.Tags.CRAFTING_GRIDS; +import static com.refinedmods.refinedstorage.common.content.Tags.CREATIVE_CONTROLLERS; +import static com.refinedmods.refinedstorage.common.content.Tags.DESTRUCTORS; +import static com.refinedmods.refinedstorage.common.content.Tags.DETECTORS; +import static com.refinedmods.refinedstorage.common.content.Tags.DISK_INTERFACES; +import static com.refinedmods.refinedstorage.common.content.Tags.EXPORTERS; +import static com.refinedmods.refinedstorage.common.content.Tags.EXTERNAL_STORAGES; +import static com.refinedmods.refinedstorage.common.content.Tags.FLUID_STORAGE_DISKS; +import static com.refinedmods.refinedstorage.common.content.Tags.GRIDS; +import static com.refinedmods.refinedstorage.common.content.Tags.IMPORTERS; +import static com.refinedmods.refinedstorage.common.content.Tags.NETWORK_RECEIVERS; +import static com.refinedmods.refinedstorage.common.content.Tags.NETWORK_TRANSMITTERS; +import static com.refinedmods.refinedstorage.common.content.Tags.RELAYS; +import static com.refinedmods.refinedstorage.common.content.Tags.SECURITY_MANAGERS; +import static com.refinedmods.refinedstorage.common.content.Tags.STORAGE_DISKS; +import static com.refinedmods.refinedstorage.common.content.Tags.WIRELESS_TRANSMITTERS; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.MOD_ID; public class ItemTagsProviderImpl extends ItemTagsProvider { public ItemTagsProviderImpl(final PackOutput packOutput, diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/tag/package-info.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/tag/package-info.java new file mode 100644 index 000000000..9dff16331 --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/tag/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.neoforge.datagen.tag; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/FluidHandlerExporterTransferStrategyFactory.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/FluidHandlerExporterTransferStrategyFactory.java similarity index 64% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/FluidHandlerExporterTransferStrategyFactory.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/FluidHandlerExporterTransferStrategyFactory.java index c58b265f4..25334c751 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/FluidHandlerExporterTransferStrategyFactory.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/FluidHandlerExporterTransferStrategyFactory.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.neoforge.exporter; +package com.refinedmods.refinedstorage.neoforge.exporter; import com.refinedmods.refinedstorage.api.network.impl.node.exporter.ExporterTransferStrategyImpl; import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.api.exporter.ExporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.exporter.FuzzyExporterTransferStrategy; -import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCache; -import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCacheImpl; -import com.refinedmods.refinedstorage.platform.neoforge.storage.FluidHandlerInsertableStorage; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.exporter.ExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.common.exporter.FuzzyExporterTransferStrategy; +import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCache; +import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCacheImpl; +import com.refinedmods.refinedstorage.neoforge.storage.FluidHandlerInsertableStorage; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/ItemHandlerExporterTransferStrategyFactory.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/ItemHandlerExporterTransferStrategyFactory.java similarity index 67% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/ItemHandlerExporterTransferStrategyFactory.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/ItemHandlerExporterTransferStrategyFactory.java index cd90beb86..5503c8038 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/ItemHandlerExporterTransferStrategyFactory.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/ItemHandlerExporterTransferStrategyFactory.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.neoforge.exporter; +package com.refinedmods.refinedstorage.neoforge.exporter; import com.refinedmods.refinedstorage.api.network.impl.node.exporter.ExporterTransferStrategyImpl; import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.api.exporter.ExporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.exporter.FuzzyExporterTransferStrategy; -import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCacheImpl; -import com.refinedmods.refinedstorage.platform.neoforge.storage.ItemHandlerInsertableStorage; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.exporter.ExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.common.exporter.FuzzyExporterTransferStrategy; +import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCacheImpl; +import com.refinedmods.refinedstorage.neoforge.storage.ItemHandlerInsertableStorage; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/package-info.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/package-info.java new file mode 100644 index 000000000..d4611951e --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.neoforge.exporter; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/CursorItemHandler.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/CursorItemHandler.java similarity index 97% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/CursorItemHandler.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/CursorItemHandler.java index 633ffda58..3a37a65ca 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/CursorItemHandler.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/CursorItemHandler.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.neoforge.grid.strategy; +package com.refinedmods.refinedstorage.neoforge.grid.strategy; import javax.annotation.Nonnull; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/FluidGridExtractionStrategy.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/FluidGridExtractionStrategy.java similarity index 88% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/FluidGridExtractionStrategy.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/FluidGridExtractionStrategy.java index 6a331fe15..3e500953b 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/FluidGridExtractionStrategy.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/FluidGridExtractionStrategy.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.neoforge.grid.strategy; +package com.refinedmods.refinedstorage.neoforge.grid.strategy; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; @@ -6,12 +6,12 @@ import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.EmptyActor; import com.refinedmods.refinedstorage.api.storage.Storage; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.resource.ResourceTypes; import javax.annotation.Nullable; @@ -25,8 +25,8 @@ import net.neoforged.neoforge.items.ItemHandlerHelper; import net.neoforged.neoforge.items.wrapper.PlayerMainInvWrapper; -import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidAction; -import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidStack; +import static com.refinedmods.refinedstorage.neoforge.support.resource.VariantUtil.toFluidAction; +import static com.refinedmods.refinedstorage.neoforge.support.resource.VariantUtil.toFluidStack; public class FluidGridExtractionStrategy implements GridExtractionStrategy { private static final ItemResource BUCKET_ITEM_RESOURCE = new ItemResource(Items.BUCKET); diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/FluidGridInsertionStrategy.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/FluidGridInsertionStrategy.java similarity index 78% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/FluidGridInsertionStrategy.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/FluidGridInsertionStrategy.java index 46b48a635..2c1dd26b1 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/FluidGridInsertionStrategy.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/FluidGridInsertionStrategy.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.neoforge.grid.strategy; +package com.refinedmods.refinedstorage.neoforge.grid.strategy; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.ResourceTypes; import javax.annotation.Nullable; @@ -17,9 +17,9 @@ import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.capability.IFluidHandlerItem; -import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.ofFluidStack; -import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidAction; -import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidStack; +import static com.refinedmods.refinedstorage.neoforge.support.resource.VariantUtil.ofFluidStack; +import static com.refinedmods.refinedstorage.neoforge.support.resource.VariantUtil.toFluidAction; +import static com.refinedmods.refinedstorage.neoforge.support.resource.VariantUtil.toFluidStack; public class FluidGridInsertionStrategy implements GridInsertionStrategy { private final AbstractContainerMenu menu; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridExtractionStrategy.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridExtractionStrategy.java similarity index 70% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridExtractionStrategy.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridExtractionStrategy.java index cc30ab2f2..707361f03 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridExtractionStrategy.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridExtractionStrategy.java @@ -1,15 +1,15 @@ -package com.refinedmods.refinedstorage.platform.neoforge.grid.strategy; +package com.refinedmods.refinedstorage.neoforge.grid.strategy; import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; -import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCache; -import com.refinedmods.refinedstorage.platform.neoforge.storage.ItemHandlerInsertableStorage; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCache; +import com.refinedmods.refinedstorage.neoforge.storage.ItemHandlerInsertableStorage; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.inventory.AbstractContainerMenu; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridInsertionStrategy.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridInsertionStrategy.java similarity index 77% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridInsertionStrategy.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridInsertionStrategy.java index 6770ec662..b6797edfa 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridInsertionStrategy.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridInsertionStrategy.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.neoforge.grid.strategy; +package com.refinedmods.refinedstorage.neoforge.grid.strategy; import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; -import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCache; -import com.refinedmods.refinedstorage.platform.neoforge.storage.ItemHandlerExtractableStorage; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCache; +import com.refinedmods.refinedstorage.neoforge.storage.ItemHandlerExtractableStorage; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.inventory.AbstractContainerMenu; @@ -17,7 +17,7 @@ import net.neoforged.neoforge.items.wrapper.InvWrapper; import net.neoforged.neoforge.items.wrapper.RangedWrapper; -import static com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource.ofItemStack; +import static com.refinedmods.refinedstorage.common.support.resource.ItemResource.ofItemStack; public class ItemGridInsertionStrategy implements GridInsertionStrategy { private final AbstractContainerMenu containerMenu; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridScrollingStrategy.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridScrollingStrategy.java similarity index 77% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridScrollingStrategy.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridScrollingStrategy.java index 65453ea79..4a178c8e1 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridScrollingStrategy.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridScrollingStrategy.java @@ -1,18 +1,18 @@ -package com.refinedmods.refinedstorage.platform.neoforge.grid.strategy; +package com.refinedmods.refinedstorage.neoforge.grid.strategy; import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.api.grid.Grid; -import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; -import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCache; -import com.refinedmods.refinedstorage.platform.neoforge.storage.ItemHandlerExtractableStorage; -import com.refinedmods.refinedstorage.platform.neoforge.storage.ItemHandlerInsertableStorage; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.grid.Grid; +import com.refinedmods.refinedstorage.common.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCache; +import com.refinedmods.refinedstorage.neoforge.storage.ItemHandlerExtractableStorage; +import com.refinedmods.refinedstorage.neoforge.storage.ItemHandlerInsertableStorage; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Inventory; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/package-info.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/package-info.java new file mode 100644 index 000000000..10669fd6c --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.neoforge.grid.strategy; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/ForgeFluidGridResourceFactory.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/view/ForgeFluidGridResourceFactory.java similarity index 67% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/ForgeFluidGridResourceFactory.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/view/ForgeFluidGridResourceFactory.java index 1f27ea832..0461c6e8d 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/ForgeFluidGridResourceFactory.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/view/ForgeFluidGridResourceFactory.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage.platform.neoforge.grid.view; +package com.refinedmods.refinedstorage.neoforge.grid.view; -import com.refinedmods.refinedstorage.platform.common.grid.view.AbstractFluidGridResourceFactory; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.grid.view.AbstractFluidGridResourceFactory; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; import net.neoforged.fml.ModList; import net.neoforged.neoforge.fluids.FluidType; -import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidStack; +import static com.refinedmods.refinedstorage.neoforge.support.resource.VariantUtil.toFluidStack; public class ForgeFluidGridResourceFactory extends AbstractFluidGridResourceFactory { @Override diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/ForgeItemGridResourceFactory.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/view/ForgeItemGridResourceFactory.java similarity index 78% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/ForgeItemGridResourceFactory.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/view/ForgeItemGridResourceFactory.java index 6cf5cf4e4..f4e6d7b12 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/ForgeItemGridResourceFactory.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/view/ForgeItemGridResourceFactory.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.neoforge.grid.view; +package com.refinedmods.refinedstorage.neoforge.grid.view; -import com.refinedmods.refinedstorage.platform.common.grid.view.AbstractItemGridResourceFactory; +import com.refinedmods.refinedstorage.common.grid.view.AbstractItemGridResourceFactory; import java.util.Objects; import java.util.Optional; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/view/package-info.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/view/package-info.java new file mode 100644 index 000000000..5152facdd --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/view/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.neoforge.grid.view; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/FluidHandlerImporterSource.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/FluidHandlerImporterSource.java similarity index 79% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/FluidHandlerImporterSource.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/FluidHandlerImporterSource.java index 30e1fa319..3bec56533 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/FluidHandlerImporterSource.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/FluidHandlerImporterSource.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.neoforge.importer; +package com.refinedmods.refinedstorage.neoforge.importer; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterSource; @@ -6,10 +6,10 @@ import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCache; -import com.refinedmods.refinedstorage.platform.neoforge.storage.FluidHandlerExtractableStorage; -import com.refinedmods.refinedstorage.platform.neoforge.storage.FluidHandlerInsertableStorage; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCache; +import com.refinedmods.refinedstorage.neoforge.storage.FluidHandlerExtractableStorage; +import com.refinedmods.refinedstorage.neoforge.storage.FluidHandlerInsertableStorage; import java.util.Iterator; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/FluidHandlerImporterTransferStrategyFactory.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/FluidHandlerImporterTransferStrategyFactory.java similarity index 74% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/FluidHandlerImporterTransferStrategyFactory.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/FluidHandlerImporterTransferStrategyFactory.java index 86602ba77..eee5eda30 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/FluidHandlerImporterTransferStrategyFactory.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/FluidHandlerImporterTransferStrategyFactory.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.neoforge.importer; +package com.refinedmods.refinedstorage.neoforge.importer; import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterSource; import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterTransferStrategyImpl; import com.refinedmods.refinedstorage.api.network.node.importer.ImporterTransferStrategy; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.api.importer.ImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCacheImpl; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.importer.ImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCacheImpl; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/ItemHandlerImporterSource.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/ItemHandlerImporterSource.java similarity index 79% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/ItemHandlerImporterSource.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/ItemHandlerImporterSource.java index 71c45fe99..8297e263a 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/ItemHandlerImporterSource.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/ItemHandlerImporterSource.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.neoforge.importer; +package com.refinedmods.refinedstorage.neoforge.importer; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterSource; @@ -6,10 +6,10 @@ import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCache; -import com.refinedmods.refinedstorage.platform.neoforge.storage.ItemHandlerExtractableStorage; -import com.refinedmods.refinedstorage.platform.neoforge.storage.ItemHandlerInsertableStorage; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCache; +import com.refinedmods.refinedstorage.neoforge.storage.ItemHandlerExtractableStorage; +import com.refinedmods.refinedstorage.neoforge.storage.ItemHandlerInsertableStorage; import java.util.Iterator; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/ItemHandlerImporterTransferStrategyFactory.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/ItemHandlerImporterTransferStrategyFactory.java similarity index 72% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/ItemHandlerImporterTransferStrategyFactory.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/ItemHandlerImporterTransferStrategyFactory.java index 4d8d9e056..f9c907263 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/ItemHandlerImporterTransferStrategyFactory.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/ItemHandlerImporterTransferStrategyFactory.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.neoforge.importer; +package com.refinedmods.refinedstorage.neoforge.importer; import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterSource; import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterTransferStrategyImpl; import com.refinedmods.refinedstorage.api.network.node.importer.ImporterTransferStrategy; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.api.importer.ImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCacheImpl; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.importer.ImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCacheImpl; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/package-info.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/package-info.java new file mode 100644 index 000000000..62f6e210e --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.neoforge.importer; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/package-info.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/package-info.java new file mode 100644 index 000000000..2fd13d923 --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.neoforge; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/CapabilityCache.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/CapabilityCache.java similarity index 94% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/CapabilityCache.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/CapabilityCache.java index 30878750b..2c2cc43bb 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/CapabilityCache.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/CapabilityCache.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage; +package com.refinedmods.refinedstorage.neoforge.storage; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; @@ -14,8 +14,8 @@ import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.items.IItemHandler; -import static com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource.ofItemStack; -import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.ofFluidStack; +import static com.refinedmods.refinedstorage.common.support.resource.ItemResource.ofItemStack; +import static com.refinedmods.refinedstorage.neoforge.support.resource.VariantUtil.ofFluidStack; public interface CapabilityCache { default Optional getItemHandler() { diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/CapabilityCacheImpl.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/CapabilityCacheImpl.java similarity index 95% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/CapabilityCacheImpl.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/CapabilityCacheImpl.java index 6641e4789..9acb099a4 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/CapabilityCacheImpl.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/CapabilityCacheImpl.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage; +package com.refinedmods.refinedstorage.neoforge.storage; import java.util.Optional; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/DiskContainerItemOverrides.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/DiskContainerItemOverrides.java similarity index 92% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/DiskContainerItemOverrides.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/DiskContainerItemOverrides.java index 27cf58b85..8b23ecfed 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/DiskContainerItemOverrides.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/DiskContainerItemOverrides.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage; +package com.refinedmods.refinedstorage.neoforge.storage; import com.refinedmods.refinedstorage.api.storage.StorageState; -import com.refinedmods.refinedstorage.platform.common.storage.AbstractDiskContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.ItemBakedModel; +import com.refinedmods.refinedstorage.common.storage.AbstractDiskContainerBlockEntity; +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.neoforge.support.render.ItemBakedModel; import java.util.List; import java.util.Map; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/FluidHandlerExtractableStorage.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/FluidHandlerExtractableStorage.java similarity index 77% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/FluidHandlerExtractableStorage.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/FluidHandlerExtractableStorage.java index a91c290d0..73ff60d63 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/FluidHandlerExtractableStorage.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/FluidHandlerExtractableStorage.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage; +package com.refinedmods.refinedstorage.neoforge.storage; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; import net.neoforged.neoforge.fluids.FluidStack; -import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidAction; -import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidStack; +import static com.refinedmods.refinedstorage.neoforge.support.resource.VariantUtil.toFluidAction; +import static com.refinedmods.refinedstorage.neoforge.support.resource.VariantUtil.toFluidStack; public class FluidHandlerExtractableStorage implements ExtractableStorage { private final CapabilityCache capabilityCache; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/FluidHandlerInsertableStorage.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/FluidHandlerInsertableStorage.java similarity index 80% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/FluidHandlerInsertableStorage.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/FluidHandlerInsertableStorage.java index b73b81973..f5f4b4862 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/FluidHandlerInsertableStorage.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/FluidHandlerInsertableStorage.java @@ -1,17 +1,17 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage; +package com.refinedmods.refinedstorage.neoforge.storage; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.capability.IFluidHandler; -import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidAction; -import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidStack; +import static com.refinedmods.refinedstorage.neoforge.support.resource.VariantUtil.toFluidAction; +import static com.refinedmods.refinedstorage.neoforge.support.resource.VariantUtil.toFluidStack; public class FluidHandlerInsertableStorage implements InsertableStorage { private final CapabilityCache capabilityCache; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/ForgeHandlerUtil.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/ForgeHandlerUtil.java similarity index 81% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/ForgeHandlerUtil.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/ForgeHandlerUtil.java index e76d0cdca..56f516035 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/ForgeHandlerUtil.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/ForgeHandlerUtil.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage; +package com.refinedmods.refinedstorage.neoforge.storage; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.items.IItemHandler; -import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.isSame; +import static com.refinedmods.refinedstorage.neoforge.support.resource.VariantUtil.isSame; final class ForgeHandlerUtil { private ForgeHandlerUtil() { diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/ItemHandlerExtractableStorage.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/ItemHandlerExtractableStorage.java similarity index 91% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/ItemHandlerExtractableStorage.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/ItemHandlerExtractableStorage.java index 06a8d4521..a8e1eb93b 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/ItemHandlerExtractableStorage.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/ItemHandlerExtractableStorage.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage; +package com.refinedmods.refinedstorage.neoforge.storage; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.items.IItemHandler; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/ItemHandlerInsertableStorage.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/ItemHandlerInsertableStorage.java similarity index 90% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/ItemHandlerInsertableStorage.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/ItemHandlerInsertableStorage.java index bae970bca..d7c785cfa 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/ItemHandlerInsertableStorage.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/ItemHandlerInsertableStorage.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage; +package com.refinedmods.refinedstorage.neoforge.storage; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.items.IItemHandler; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveBakedModel.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/DiskDriveBakedModel.java similarity index 90% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveBakedModel.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/DiskDriveBakedModel.java index 3755fe14d..2a920a64c 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveBakedModel.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/DiskDriveBakedModel.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage.diskdrive; +package com.refinedmods.refinedstorage.neoforge.storage.diskdrive; import com.refinedmods.refinedstorage.api.storage.StorageState; -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.DiskDriveBlock; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage.platform.neoforge.storage.DiskContainerItemOverrides; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.DiskModelBaker; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.RotationTranslationModelBaker; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.TransformationBuilder; +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.common.storage.diskdrive.DiskDriveBlock; +import com.refinedmods.refinedstorage.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.neoforge.storage.DiskContainerItemOverrides; +import com.refinedmods.refinedstorage.neoforge.support.render.DiskModelBaker; +import com.refinedmods.refinedstorage.neoforge.support.render.RotationTranslationModelBaker; +import com.refinedmods.refinedstorage.neoforge.support.render.TransformationBuilder; import java.util.Arrays; import java.util.Collections; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java new file mode 100644 index 000000000..4756650aa --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java @@ -0,0 +1,18 @@ +package com.refinedmods.refinedstorage.neoforge.storage.diskdrive; + +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.common.storage.diskdrive.AbstractDiskDriveBlockEntity; +import com.refinedmods.refinedstorage.common.storage.diskdrive.AbstractDiskDriveBlockEntityRenderer; +import com.refinedmods.refinedstorage.neoforge.support.render.RenderTypes; + +public class DiskDriveBlockEntityRendererImpl + extends AbstractDiskDriveBlockEntityRenderer { + public DiskDriveBlockEntityRendererImpl() { + super(RenderTypes.DISK_LED); + } + + @Override + protected Disk[] getDisks(final AbstractDiskDriveBlockEntity blockEntity) { + return blockEntity.getModelData().get(ForgeDiskDriveBlockEntity.DISKS_PROPERTY); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveGeometryLoader.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/DiskDriveGeometryLoader.java similarity index 86% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveGeometryLoader.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/DiskDriveGeometryLoader.java index ba576706f..01f91ad61 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveGeometryLoader.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/DiskDriveGeometryLoader.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage.diskdrive; +package com.refinedmods.refinedstorage.neoforge.storage.diskdrive; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveUnbakedGeometry.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/DiskDriveUnbakedGeometry.java similarity index 84% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveUnbakedGeometry.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/DiskDriveUnbakedGeometry.java index d07034568..ebdd2999e 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveUnbakedGeometry.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/DiskDriveUnbakedGeometry.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage.diskdrive; +package com.refinedmods.refinedstorage.neoforge.storage.diskdrive; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.DiskModelBaker; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.RotationTranslationModelBaker; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.neoforge.support.render.DiskModelBaker; +import com.refinedmods.refinedstorage.neoforge.support.render.RotationTranslationModelBaker; import java.util.function.Function; @@ -17,7 +17,7 @@ import net.neoforged.neoforge.client.model.geometry.IGeometryBakingContext; import net.neoforged.neoforge.client.model.geometry.IUnbakedGeometry; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; import static java.util.Objects.requireNonNull; public class DiskDriveUnbakedGeometry implements IUnbakedGeometry { diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/ForgeDiskDriveBlockEntity.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/ForgeDiskDriveBlockEntity.java similarity index 77% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/ForgeDiskDriveBlockEntity.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/ForgeDiskDriveBlockEntity.java index 47801f7f3..8d0a14f00 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/ForgeDiskDriveBlockEntity.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/ForgeDiskDriveBlockEntity.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage.diskdrive; +package com.refinedmods.refinedstorage.neoforge.storage.diskdrive; -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.common.storage.diskdrive.AbstractDiskDriveBlockEntity; import javax.annotation.Nonnull; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/package-info.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/package-info.java new file mode 100644 index 000000000..d8371671d --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.neoforge.storage.diskdrive; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceBakedModel.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/DiskInterfaceBakedModel.java similarity index 89% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceBakedModel.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/DiskInterfaceBakedModel.java index 2b0d3a885..cc2d75694 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceBakedModel.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/DiskInterfaceBakedModel.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage.diskinterface; +package com.refinedmods.refinedstorage.neoforge.storage.diskinterface; import com.refinedmods.refinedstorage.api.storage.StorageState; -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.DiskInterfaceBlock; -import com.refinedmods.refinedstorage.platform.common.support.AbstractActiveColoredDirectionalBlock; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage.platform.neoforge.storage.DiskContainerItemOverrides; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.DiskModelBaker; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.RotationTranslationModelBaker; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.TransformationBuilder; +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.common.storage.diskinterface.DiskInterfaceBlock; +import com.refinedmods.refinedstorage.common.support.AbstractActiveColoredDirectionalBlock; +import com.refinedmods.refinedstorage.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.neoforge.storage.DiskContainerItemOverrides; +import com.refinedmods.refinedstorage.neoforge.support.render.DiskModelBaker; +import com.refinedmods.refinedstorage.neoforge.support.render.RotationTranslationModelBaker; +import com.refinedmods.refinedstorage.neoforge.support.render.TransformationBuilder; import java.util.Arrays; import java.util.Collections; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java new file mode 100644 index 000000000..64faa7756 --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java @@ -0,0 +1,18 @@ +package com.refinedmods.refinedstorage.neoforge.storage.diskinterface; + +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.common.storage.diskinterface.AbstractDiskInterfaceBlockEntityRenderer; +import com.refinedmods.refinedstorage.neoforge.support.render.RenderTypes; + +public class DiskInterfaceBlockEntityRendererImpl + extends AbstractDiskInterfaceBlockEntityRenderer { + public DiskInterfaceBlockEntityRendererImpl() { + super(RenderTypes.DISK_LED); + } + + @Override + protected Disk[] getDisks(final AbstractDiskInterfaceBlockEntity blockEntity) { + return blockEntity.getModelData().get(ForgeDiskInterfaceBlockEntity.DISKS_PROPERTY); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceGeometryLoader.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/DiskInterfaceGeometryLoader.java similarity index 89% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceGeometryLoader.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/DiskInterfaceGeometryLoader.java index 68166f5ea..ee3971486 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceGeometryLoader.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/DiskInterfaceGeometryLoader.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage.diskinterface; +package com.refinedmods.refinedstorage.neoforge.storage.diskinterface; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java similarity index 86% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java index 4b06d115b..db2c67c15 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage.diskinterface; +package com.refinedmods.refinedstorage.neoforge.storage.diskinterface; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.DiskModelBaker; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.RotationTranslationModelBaker; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.neoforge.support.render.DiskModelBaker; +import com.refinedmods.refinedstorage.neoforge.support.render.RotationTranslationModelBaker; import java.util.function.Function; @@ -18,7 +18,7 @@ import net.neoforged.neoforge.client.model.geometry.IGeometryBakingContext; import net.neoforged.neoforge.client.model.geometry.IUnbakedGeometry; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; import static java.util.Objects.requireNonNull; public class DiskInterfaceUnbakedGeometry implements IUnbakedGeometry { diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/ForgeDiskInterfaceBlockEntity.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/ForgeDiskInterfaceBlockEntity.java similarity index 76% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/ForgeDiskInterfaceBlockEntity.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/ForgeDiskInterfaceBlockEntity.java index f5816313e..4a4a3d98d 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/ForgeDiskInterfaceBlockEntity.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/ForgeDiskInterfaceBlockEntity.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage.diskinterface; +package com.refinedmods.refinedstorage.neoforge.storage.diskinterface; -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; import javax.annotation.Nonnull; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/package-info.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/package-info.java new file mode 100644 index 000000000..4c1e08145 --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.neoforge.storage.diskinterface; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/FluidHandlerExternalStorageProvider.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/FluidHandlerExternalStorageProvider.java similarity index 78% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/FluidHandlerExternalStorageProvider.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/FluidHandlerExternalStorageProvider.java index c71d967bc..794a81dfe 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/FluidHandlerExternalStorageProvider.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/FluidHandlerExternalStorageProvider.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage.externalstorage; +package com.refinedmods.refinedstorage.neoforge.storage.externalstorage; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; @@ -7,10 +7,10 @@ import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCache; -import com.refinedmods.refinedstorage.platform.neoforge.storage.FluidHandlerExtractableStorage; -import com.refinedmods.refinedstorage.platform.neoforge.storage.FluidHandlerInsertableStorage; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCache; +import com.refinedmods.refinedstorage.neoforge.storage.FluidHandlerExtractableStorage; +import com.refinedmods.refinedstorage.neoforge.storage.FluidHandlerInsertableStorage; import java.util.Iterator; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/FluidHandlerPlatformExternalStorageProviderFactory.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/FluidHandlerPlatformExternalStorageProviderFactory.java similarity index 71% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/FluidHandlerPlatformExternalStorageProviderFactory.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/FluidHandlerPlatformExternalStorageProviderFactory.java index a64aecf55..09fd6b077 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/FluidHandlerPlatformExternalStorageProviderFactory.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/FluidHandlerPlatformExternalStorageProviderFactory.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage.externalstorage; +package com.refinedmods.refinedstorage.neoforge.storage.externalstorage; import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; -import com.refinedmods.refinedstorage.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; -import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCacheImpl; +import com.refinedmods.refinedstorage.common.api.storage.externalstorage.PlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCacheImpl; import java.util.Optional; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/ItemHandlerExternalStorageProvider.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/ItemHandlerExternalStorageProvider.java similarity index 78% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/ItemHandlerExternalStorageProvider.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/ItemHandlerExternalStorageProvider.java index 8674dbbff..3f6bf26e0 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/ItemHandlerExternalStorageProvider.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/ItemHandlerExternalStorageProvider.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage.externalstorage; +package com.refinedmods.refinedstorage.neoforge.storage.externalstorage; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; @@ -7,10 +7,10 @@ import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; -import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCache; -import com.refinedmods.refinedstorage.platform.neoforge.storage.ItemHandlerExtractableStorage; -import com.refinedmods.refinedstorage.platform.neoforge.storage.ItemHandlerInsertableStorage; +import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCache; +import com.refinedmods.refinedstorage.neoforge.storage.ItemHandlerExtractableStorage; +import com.refinedmods.refinedstorage.neoforge.storage.ItemHandlerInsertableStorage; import java.util.Iterator; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/ItemHandlerPlatformExternalStorageProviderFactory.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/ItemHandlerPlatformExternalStorageProviderFactory.java similarity index 71% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/ItemHandlerPlatformExternalStorageProviderFactory.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/ItemHandlerPlatformExternalStorageProviderFactory.java index d65eb3ea9..bd5ef8295 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/ItemHandlerPlatformExternalStorageProviderFactory.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/ItemHandlerPlatformExternalStorageProviderFactory.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage.externalstorage; +package com.refinedmods.refinedstorage.neoforge.storage.externalstorage; import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; -import com.refinedmods.refinedstorage.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; -import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCacheImpl; +import com.refinedmods.refinedstorage.common.api.storage.externalstorage.PlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCacheImpl; import java.util.Optional; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/package-info.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/package-info.java new file mode 100644 index 000000000..7c166786e --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.neoforge.storage.externalstorage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/package-info.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/package-info.java new file mode 100644 index 000000000..162536a13 --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.neoforge.storage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/DiskLedBakers.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/DiskLedBakers.java similarity index 76% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/DiskLedBakers.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/DiskLedBakers.java index f81ce7e0d..47bfdb4c2 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/DiskLedBakers.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/DiskLedBakers.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage.portablegrid; +package com.refinedmods.refinedstorage.neoforge.storage.portablegrid; import com.refinedmods.refinedstorage.api.storage.StorageState; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.RotationTranslationModelBaker; +import com.refinedmods.refinedstorage.neoforge.support.render.RotationTranslationModelBaker; record DiskLedBakers( RotationTranslationModelBaker inactiveBaker, diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/ForgePortableGridBlockEntity.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/ForgePortableGridBlockEntity.java similarity index 71% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/ForgePortableGridBlockEntity.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/ForgePortableGridBlockEntity.java index cc1f73317..2c197d74f 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/ForgePortableGridBlockEntity.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/ForgePortableGridBlockEntity.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage.portablegrid; +package com.refinedmods.refinedstorage.neoforge.storage.portablegrid; -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridType; +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.common.storage.portablegrid.AbstractPortableGridBlockEntity; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridType; import javax.annotation.Nonnull; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridBakedModel.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/PortableGridBakedModel.java similarity index 86% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridBakedModel.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/PortableGridBakedModel.java index 5f8c2a03b..7c5f2dc58 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridBakedModel.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/PortableGridBakedModel.java @@ -1,15 +1,15 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage.portablegrid; +package com.refinedmods.refinedstorage.neoforge.storage.portablegrid; import com.refinedmods.refinedstorage.api.storage.StorageState; -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlock; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlockItem; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlockItemRenderInfo; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.DiskModelBaker; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.ItemBakedModel; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.RotationTranslationModelBaker; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.TransformationBuilder; +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridBlock; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridBlockItem; +import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridBlockItemRenderInfo; +import com.refinedmods.refinedstorage.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.neoforge.support.render.DiskModelBaker; +import com.refinedmods.refinedstorage.neoforge.support.render.ItemBakedModel; +import com.refinedmods.refinedstorage.neoforge.support.render.RotationTranslationModelBaker; +import com.refinedmods.refinedstorage.neoforge.support.render.TransformationBuilder; import java.util.Collections; import java.util.List; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridBlockEntityRendererImpl.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/PortableGridBlockEntityRendererImpl.java similarity index 50% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridBlockEntityRendererImpl.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/PortableGridBlockEntityRendererImpl.java index 71dc5b662..d14695eb1 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridBlockEntityRendererImpl.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/PortableGridBlockEntityRendererImpl.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage.portablegrid; +package com.refinedmods.refinedstorage.neoforge.storage.portablegrid; -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.AbstractPortableGridBlockEntityRenderer; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.RenderTypes; +import com.refinedmods.refinedstorage.common.storage.Disk; +import com.refinedmods.refinedstorage.common.storage.portablegrid.AbstractPortableGridBlockEntity; +import com.refinedmods.refinedstorage.common.storage.portablegrid.AbstractPortableGridBlockEntityRenderer; +import com.refinedmods.refinedstorage.neoforge.support.render.RenderTypes; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridGeometryLoader.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/PortableGridGeometryLoader.java similarity index 86% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridGeometryLoader.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/PortableGridGeometryLoader.java index 02ff78940..f49e6deb8 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridGeometryLoader.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/PortableGridGeometryLoader.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage.portablegrid; +package com.refinedmods.refinedstorage.neoforge.storage.portablegrid; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridUnbakedGeometry.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/PortableGridUnbakedGeometry.java similarity index 88% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridUnbakedGeometry.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/PortableGridUnbakedGeometry.java index 06a7cf02e..b43367d0b 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridUnbakedGeometry.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/PortableGridUnbakedGeometry.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage.portablegrid; +package com.refinedmods.refinedstorage.neoforge.storage.portablegrid; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.DiskModelBaker; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.RotationTranslationModelBaker; +import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.neoforge.support.render.DiskModelBaker; +import com.refinedmods.refinedstorage.neoforge.support.render.RotationTranslationModelBaker; import java.util.function.Function; @@ -17,7 +17,7 @@ import net.neoforged.neoforge.client.model.geometry.IGeometryBakingContext; import net.neoforged.neoforge.client.model.geometry.IUnbakedGeometry; -import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; import static java.util.Objects.requireNonNull; public class PortableGridUnbakedGeometry implements IUnbakedGeometry { diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/package-info.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/package-info.java new file mode 100644 index 000000000..a938cd036 --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.neoforge.storage.portablegrid; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/ContainerTransferDestination.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/containermenu/ContainerTransferDestination.java similarity index 74% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/ContainerTransferDestination.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/containermenu/ContainerTransferDestination.java index 6dde05407..59fbf97e1 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/ContainerTransferDestination.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/containermenu/ContainerTransferDestination.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.neoforge.support.containermenu; +package com.refinedmods.refinedstorage.neoforge.support.containermenu; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferDestination; +import com.refinedmods.refinedstorage.common.support.containermenu.TransferDestination; import net.minecraft.world.Container; import net.minecraft.world.item.ItemStack; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/MenuOpenerImpl.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/containermenu/MenuOpenerImpl.java similarity index 75% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/MenuOpenerImpl.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/containermenu/MenuOpenerImpl.java index 6be6d3531..88ee111ad 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/MenuOpenerImpl.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/containermenu/MenuOpenerImpl.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.neoforge.support.containermenu; +package com.refinedmods.refinedstorage.neoforge.support.containermenu; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.ExtendedMenuProvider; -import com.refinedmods.refinedstorage.platform.common.support.containermenu.MenuOpener; +import com.refinedmods.refinedstorage.common.support.containermenu.ExtendedMenuProvider; +import com.refinedmods.refinedstorage.common.support.containermenu.MenuOpener; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.MenuProvider; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/containermenu/package-info.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/containermenu/package-info.java new file mode 100644 index 000000000..7aa7c1786 --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/containermenu/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.neoforge.support.containermenu; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/energy/EnergyStorageAdapter.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/energy/EnergyStorageAdapter.java similarity index 93% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/energy/EnergyStorageAdapter.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/energy/EnergyStorageAdapter.java index 3fb7b9a86..7674732c0 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/energy/EnergyStorageAdapter.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/energy/EnergyStorageAdapter.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.neoforge.support.energy; +package com.refinedmods.refinedstorage.neoforge.support.energy; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/energy/package-info.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/energy/package-info.java new file mode 100644 index 000000000..8117d6938 --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/energy/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.neoforge.support.energy; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/inventory/InsertExtractItemHandler.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/inventory/InsertExtractItemHandler.java similarity index 96% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/inventory/InsertExtractItemHandler.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/inventory/InsertExtractItemHandler.java index 01b87a8fe..f30569600 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/inventory/InsertExtractItemHandler.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/inventory/InsertExtractItemHandler.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.neoforge.support.inventory; +package com.refinedmods.refinedstorage.neoforge.support.inventory; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.items.IItemHandler; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/package-info.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/inventory/package-info.java similarity index 76% rename from refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/package-info.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/inventory/package-info.java index 082fc740f..50726584c 100644 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/package-info.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/inventory/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.grid.strategy; +package com.refinedmods.refinedstorage.neoforge.support.inventory; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/DiskModelBaker.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/DiskModelBaker.java similarity index 89% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/DiskModelBaker.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/DiskModelBaker.java index a9c1031e4..085cef3f6 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/DiskModelBaker.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/DiskModelBaker.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.neoforge.support.render; +package com.refinedmods.refinedstorage.neoforge.support.render; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.PlatformApi; import java.util.Map; import java.util.function.Function; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/FluidStackFluidRenderer.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/FluidStackFluidRenderer.java similarity index 92% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/FluidStackFluidRenderer.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/FluidStackFluidRenderer.java index 13d440be1..b7e071ba9 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/FluidStackFluidRenderer.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/FluidStackFluidRenderer.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.neoforge.support.render; +package com.refinedmods.refinedstorage.neoforge.support.render; -import com.refinedmods.refinedstorage.platform.common.support.render.AbstractFluidRenderer; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.render.AbstractFluidRenderer; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; import java.util.Collections; import java.util.HashMap; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/ItemBakedModel.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/ItemBakedModel.java similarity index 96% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/ItemBakedModel.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/ItemBakedModel.java index cf0486995..2c573f918 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/ItemBakedModel.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/ItemBakedModel.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.neoforge.support.render; +package com.refinedmods.refinedstorage.neoforge.support.render; import java.util.Collections; import java.util.List; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/RenderTypes.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/RenderTypes.java similarity index 90% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/RenderTypes.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/RenderTypes.java index 3fc2a1fba..4b8694c6c 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/RenderTypes.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/RenderTypes.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.neoforge.support.render; +package com.refinedmods.refinedstorage.neoforge.support.render; import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.VertexFormat; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/RotationTranslationModelBaker.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/RotationTranslationModelBaker.java similarity index 96% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/RotationTranslationModelBaker.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/RotationTranslationModelBaker.java index 1ab96ec25..36ecb03e7 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/RotationTranslationModelBaker.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/RotationTranslationModelBaker.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.neoforge.support.render; +package com.refinedmods.refinedstorage.neoforge.support.render; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/TransformationBuilder.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/TransformationBuilder.java similarity index 86% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/TransformationBuilder.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/TransformationBuilder.java index 9837ea16d..c2911785d 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/TransformationBuilder.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/TransformationBuilder.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.platform.neoforge.support.render; +package com.refinedmods.refinedstorage.neoforge.support.render; -import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.common.support.direction.BiDirection; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/package-info.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/package-info.java new file mode 100644 index 000000000..b9967b2ce --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.neoforge.support.render; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/ResourceContainerFluidHandlerAdapter.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/resource/ResourceContainerFluidHandlerAdapter.java similarity index 81% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/ResourceContainerFluidHandlerAdapter.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/resource/ResourceContainerFluidHandlerAdapter.java index dd3e857b6..d14f2cbd7 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/ResourceContainerFluidHandlerAdapter.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/resource/ResourceContainerFluidHandlerAdapter.java @@ -1,19 +1,19 @@ -package com.refinedmods.refinedstorage.platform.neoforge.support.resource; +package com.refinedmods.refinedstorage.neoforge.support.resource; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.ResourceTypes; import javax.annotation.Nullable; import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.capability.IFluidHandler; -import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.ofFluidStack; -import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toAction; -import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidStack; +import static com.refinedmods.refinedstorage.neoforge.support.resource.VariantUtil.ofFluidStack; +import static com.refinedmods.refinedstorage.neoforge.support.resource.VariantUtil.toAction; +import static com.refinedmods.refinedstorage.neoforge.support.resource.VariantUtil.toFluidStack; public class ResourceContainerFluidHandlerAdapter implements IFluidHandler { private final ResourceContainer container; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/VariantUtil.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/resource/VariantUtil.java similarity index 91% rename from refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/VariantUtil.java rename to refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/resource/VariantUtil.java index 3a050e902..cc45eb941 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/VariantUtil.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/resource/VariantUtil.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.neoforge.support.resource; +package com.refinedmods.refinedstorage.neoforge.support.resource; import com.refinedmods.refinedstorage.api.core.Action; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; import java.util.Objects; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/resource/package-info.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/resource/package-info.java new file mode 100644 index 000000000..8dcdd6709 --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/resource/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.neoforge.support.resource; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/resources/META-INF/accesstransformer.cfg b/refinedstorage-neoforge/src/main/resources/META-INF/accesstransformer.cfg similarity index 100% rename from refinedstorage-platform-neoforge/src/main/resources/META-INF/accesstransformer.cfg rename to refinedstorage-neoforge/src/main/resources/META-INF/accesstransformer.cfg diff --git a/refinedstorage-platform-neoforge/src/main/resources/META-INF/neoforge.mods.toml b/refinedstorage-neoforge/src/main/resources/META-INF/neoforge.mods.toml similarity index 84% rename from refinedstorage-platform-neoforge/src/main/resources/META-INF/neoforge.mods.toml rename to refinedstorage-neoforge/src/main/resources/META-INF/neoforge.mods.toml index f24984832..296fa69fb 100644 --- a/refinedstorage-platform-neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/refinedstorage-neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -13,8 +13,8 @@ description = ''' Refined Storage is a mass storage mod for Minecraft that offers the player a network-based storage system, allowing them to store items and fluids on a massively expandable device network. ''' [[dependencies.refinedstorage]] -modId="neoforge" -type="required" -versionRange="[21.0.112-beta,)" -ordering="NONE" -side="BOTH" +modId = "neoforge" +type = "required" +versionRange = "[21.0.112-beta,)" +ordering = "NONE" +side = "BOTH" diff --git a/refinedstorage-platform-neoforge/src/main/resources/icon.png b/refinedstorage-neoforge/src/main/resources/icon.png similarity index 100% rename from refinedstorage-platform-neoforge/src/main/resources/icon.png rename to refinedstorage-neoforge/src/main/resources/icon.png diff --git a/refinedstorage-platform-neoforge/src/main/resources/pack.mcmeta b/refinedstorage-neoforge/src/main/resources/pack.mcmeta similarity index 100% rename from refinedstorage-platform-neoforge/src/main/resources/pack.mcmeta rename to refinedstorage-neoforge/src/main/resources/pack.mcmeta diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/GameTestUtil.java b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/GameTestUtil.java similarity index 93% rename from refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/GameTestUtil.java rename to refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/GameTestUtil.java index 249734897..9b9ed962f 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/GameTestUtil.java +++ b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/GameTestUtil.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.platform.common; +package com.refinedmods.refinedstorage.common; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.Network; @@ -7,13 +7,13 @@ import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.EmptyActor; -import com.refinedmods.refinedstorage.platform.api.support.network.AbstractNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage.platform.common.content.Blocks; -import com.refinedmods.refinedstorage.platform.common.content.Items; -import com.refinedmods.refinedstorage.platform.common.iface.InterfaceBlockEntity; -import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.common.api.support.network.AbstractNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.common.content.Blocks; +import com.refinedmods.refinedstorage.common.content.Items; +import com.refinedmods.refinedstorage.common.iface.InterfaceBlockEntity; +import com.refinedmods.refinedstorage.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.util.Arrays; import java.util.Iterator; @@ -116,9 +116,9 @@ public static void assertFluidPresent(final GameTestHelper helper, } public static void assertItemEntityPresentExactly(final GameTestHelper helper, - final ItemStack itemStack, - final BlockPos pos, - final double expansionAmount) { + final ItemStack itemStack, + final BlockPos pos, + final double expansionAmount) { final BlockPos blockpos = helper.absolutePos(pos); final Iterator entityIterator = helper.getLevel().getEntities(EntityType.ITEM, (new AABB(blockpos)).inflate(expansionAmount), Entity::isAlive).iterator(); diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorTest.java b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorTest.java similarity index 82% rename from refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorTest.java rename to refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorTest.java index 9221aa1c5..f726490b7 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorTest.java +++ b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorTest.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.util.IdentifierUtil; import java.util.List; @@ -15,14 +15,13 @@ import net.neoforged.neoforge.gametest.GameTestHolder; import net.neoforged.neoforge.gametest.PrefixGameTestTemplate; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.RSITEMS; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.asResource; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.assertFluidPresent; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.assertItemEntityPresentExactly; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.insert; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.networkIsAvailable; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.storageContainsExactly; -import static com.refinedmods.refinedstorage.platform.common.constructordestructor.ConstructorTestPlots.preparePlot; +import static com.refinedmods.refinedstorage.common.GameTestUtil.RSITEMS; +import static com.refinedmods.refinedstorage.common.GameTestUtil.asResource; +import static com.refinedmods.refinedstorage.common.GameTestUtil.assertFluidPresent; +import static com.refinedmods.refinedstorage.common.GameTestUtil.assertItemEntityPresentExactly; +import static com.refinedmods.refinedstorage.common.GameTestUtil.insert; +import static com.refinedmods.refinedstorage.common.GameTestUtil.networkIsAvailable; +import static com.refinedmods.refinedstorage.common.GameTestUtil.storageContainsExactly; import static net.minecraft.world.item.Items.DIRT; import static net.minecraft.world.item.Items.FIREWORK_ROCKET; import static net.minecraft.world.item.Items.STONE; @@ -36,7 +35,7 @@ private ConstructorTest() { @GameTest(template = "empty_15x15") public static void shouldPlaceBlock(final GameTestHelper helper) { - preparePlot(helper, Direction.EAST, (constructor, pos, sequence) -> { + ConstructorTestPlots.preparePlot(helper, Direction.EAST, (constructor, pos, sequence) -> { // Arrange sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { insert(helper, network, DIRT, 10); @@ -61,7 +60,7 @@ public static void shouldPlaceBlock(final GameTestHelper helper) { @GameTest(template = "empty_15x15") public static void shouldPlaceWater(final GameTestHelper helper) { - preparePlot(helper, Direction.EAST, (constructor, pos, sequence) -> { + ConstructorTestPlots.preparePlot(helper, Direction.EAST, (constructor, pos, sequence) -> { // Arrange sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { insert(helper, network, DIRT, 10); @@ -88,7 +87,7 @@ public static void shouldPlaceWater(final GameTestHelper helper) { @GameTest(template = "empty_15x15") public static void shouldDropItem(final GameTestHelper helper) { - preparePlot(helper, Direction.EAST, (constructor, pos, sequence) -> { + ConstructorTestPlots.preparePlot(helper, Direction.EAST, (constructor, pos, sequence) -> { // Arrange sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { insert(helper, network, DIRT, 10); @@ -120,7 +119,7 @@ public static void shouldDropItem(final GameTestHelper helper) { @GameTest(template = "empty_15x15") public static void shouldDropItemWithStackUpgrade(final GameTestHelper helper) { - preparePlot(helper, Direction.EAST, (constructor, pos, sequence) -> { + ConstructorTestPlots.preparePlot(helper, Direction.EAST, (constructor, pos, sequence) -> { // Arrange sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { insert(helper, network, DIRT, 65); @@ -160,7 +159,7 @@ public static void shouldDropItemWithStackUpgrade(final GameTestHelper helper) { @GameTest(template = "empty_15x15") public static void shouldPlaceFireworks(final GameTestHelper helper) { - preparePlot(helper, Direction.EAST, (constructor, pos, sequence) -> { + ConstructorTestPlots.preparePlot(helper, Direction.EAST, (constructor, pos, sequence) -> { // Arrange sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { insert(helper, network, DIRT, 10); diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorTestPlots.java b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorTestPlots.java similarity index 75% rename from refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorTestPlots.java rename to refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorTestPlots.java index 543e2560a..6dffb40cd 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorTestPlots.java +++ b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorTestPlots.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; +import com.refinedmods.refinedstorage.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.common.storage.ItemStorageVariant; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -9,8 +9,8 @@ import net.minecraft.gametest.framework.GameTestSequence; import org.apache.commons.lang3.function.TriConsumer; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.RSBLOCKS; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.requireBlockEntity; +import static com.refinedmods.refinedstorage.common.GameTestUtil.RSBLOCKS; +import static com.refinedmods.refinedstorage.common.GameTestUtil.requireBlockEntity; import static net.minecraft.core.BlockPos.ZERO; final class ConstructorTestPlots { diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorTest.java b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorTest.java similarity index 87% rename from refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorTest.java rename to refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorTest.java index f6ae954c5..97420b47f 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorTest.java +++ b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorTest.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.util.IdentifierUtil; import java.util.Set; @@ -14,11 +14,10 @@ import net.neoforged.neoforge.gametest.GameTestHolder; import net.neoforged.neoforge.gametest.PrefixGameTestTemplate; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.asResource; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.insert; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.networkIsAvailable; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.storageContainsExactly; -import static com.refinedmods.refinedstorage.platform.common.constructordestructor.DestructorTestPlots.preparePlot; +import static com.refinedmods.refinedstorage.common.GameTestUtil.asResource; +import static com.refinedmods.refinedstorage.common.GameTestUtil.insert; +import static com.refinedmods.refinedstorage.common.GameTestUtil.networkIsAvailable; +import static com.refinedmods.refinedstorage.common.GameTestUtil.storageContainsExactly; import static net.minecraft.world.item.Items.DIRT; import static net.minecraft.world.item.Items.STONE; import static net.minecraft.world.level.material.Fluids.LAVA; @@ -32,7 +31,7 @@ private DestructorTest() { @GameTest(template = "empty_15x15") public static void shouldBreakBlock(final GameTestHelper helper) { - preparePlot(helper, Direction.EAST, (destructor, pos, sequence) -> { + DestructorTestPlots.preparePlot(helper, Direction.EAST, (destructor, pos, sequence) -> { // Arrange sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { insert(helper, network, DIRT, 10); @@ -57,7 +56,7 @@ public static void shouldBreakBlock(final GameTestHelper helper) { @GameTest(template = "empty_15x15") public static void shouldBreakBlockAllowlist(final GameTestHelper helper) { - preparePlot(helper, Direction.EAST, (destructor, pos, sequence) -> { + DestructorTestPlots.preparePlot(helper, Direction.EAST, (destructor, pos, sequence) -> { // Arrange sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { insert(helper, network, DIRT, 10); @@ -88,7 +87,7 @@ public static void shouldBreakBlockAllowlist(final GameTestHelper helper) { @GameTest(template = "empty_15x15") public static void shouldBreakBlockBlocklist(final GameTestHelper helper) { - preparePlot(helper, Direction.EAST, (destructor, pos, sequence) -> { + DestructorTestPlots.preparePlot(helper, Direction.EAST, (destructor, pos, sequence) -> { // Arrange sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { insert(helper, network, DIRT, 10); @@ -119,7 +118,7 @@ public static void shouldBreakBlockBlocklist(final GameTestHelper helper) { @GameTest(template = "empty_15x15") public static void shouldPickupItemAllowlist(final GameTestHelper helper) { - preparePlot(helper, Direction.EAST, (destructor, pos, sequence) -> { + DestructorTestPlots.preparePlot(helper, Direction.EAST, (destructor, pos, sequence) -> { // Arrange sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { insert(helper, network, DIRT, 10); @@ -151,7 +150,7 @@ public static void shouldPickupItemAllowlist(final GameTestHelper helper) { @GameTest(template = "empty_15x15") public static void shouldPickupItemBlocklist(final GameTestHelper helper) { - preparePlot(helper, Direction.EAST, (destructor, pos, sequence) -> { + DestructorTestPlots.preparePlot(helper, Direction.EAST, (destructor, pos, sequence) -> { // Arrange sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { insert(helper, network, DIRT, 10); @@ -183,7 +182,7 @@ public static void shouldPickupItemBlocklist(final GameTestHelper helper) { @GameTest(template = "empty_15x15") public static void shouldDrainFluidAllowlist(final GameTestHelper helper) { - preparePlot(helper, Direction.EAST, (destructor, pos, sequence) -> { + DestructorTestPlots.preparePlot(helper, Direction.EAST, (destructor, pos, sequence) -> { // Arrange sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { insert(helper, network, DIRT, 10); @@ -215,7 +214,7 @@ public static void shouldDrainFluidAllowlist(final GameTestHelper helper) { @GameTest(template = "empty_15x15") public static void shouldDrainFluidBlocklist(final GameTestHelper helper) { - preparePlot(helper, Direction.EAST, (destructor, pos, sequence) -> { + DestructorTestPlots.preparePlot(helper, Direction.EAST, (destructor, pos, sequence) -> { // Arrange sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { insert(helper, network, DIRT, 10); diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorTestPlots.java b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorTestPlots.java similarity index 75% rename from refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorTestPlots.java rename to refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorTestPlots.java index 286727b45..0df2e00de 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorTestPlots.java +++ b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorTestPlots.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.common.constructordestructor; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; +import com.refinedmods.refinedstorage.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.common.storage.ItemStorageVariant; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -9,8 +9,8 @@ import net.minecraft.gametest.framework.GameTestSequence; import org.apache.commons.lang3.function.TriConsumer; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.RSBLOCKS; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.requireBlockEntity; +import static com.refinedmods.refinedstorage.common.GameTestUtil.RSBLOCKS; +import static com.refinedmods.refinedstorage.common.GameTestUtil.requireBlockEntity; import static net.minecraft.core.BlockPos.ZERO; final class DestructorTestPlots { diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTest.java b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/exporter/ExporterTest.java similarity index 84% rename from refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTest.java rename to refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/exporter/ExporterTest.java index 4bcc08ee4..b8af35175 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTest.java +++ b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/exporter/ExporterTest.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage.platform.common.exporter; +package com.refinedmods.refinedstorage.common.exporter; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.util.IdentifierUtil; import java.util.List; @@ -15,15 +15,14 @@ import net.neoforged.neoforge.gametest.GameTestHolder; import net.neoforged.neoforge.gametest.PrefixGameTestTemplate; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.RSBLOCKS; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.RSITEMS; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.asResource; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.containerContainsExactly; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.insert; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.interfaceContainsExactly; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.networkIsAvailable; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.storageContainsExactly; -import static com.refinedmods.refinedstorage.platform.common.exporter.ExporterTestPlots.preparePlot; +import static com.refinedmods.refinedstorage.common.GameTestUtil.RSBLOCKS; +import static com.refinedmods.refinedstorage.common.GameTestUtil.RSITEMS; +import static com.refinedmods.refinedstorage.common.GameTestUtil.asResource; +import static com.refinedmods.refinedstorage.common.GameTestUtil.containerContainsExactly; +import static com.refinedmods.refinedstorage.common.GameTestUtil.insert; +import static com.refinedmods.refinedstorage.common.GameTestUtil.interfaceContainsExactly; +import static com.refinedmods.refinedstorage.common.GameTestUtil.networkIsAvailable; +import static com.refinedmods.refinedstorage.common.GameTestUtil.storageContainsExactly; import static net.minecraft.world.item.Items.DIAMOND_CHESTPLATE; import static net.minecraft.world.item.Items.DIRT; import static net.minecraft.world.item.Items.STONE; @@ -37,7 +36,7 @@ private ExporterTest() { @GameTest(template = "empty_15x15") public static void shouldExportItem(final GameTestHelper helper) { - preparePlot(helper, Blocks.CHEST, Direction.EAST, (exporter, pos, sequence) -> { + ExporterTestPlots.preparePlot(helper, Blocks.CHEST, Direction.EAST, (exporter, pos, sequence) -> { // Arrange final ItemStack damagedDiamondChestplate = DIAMOND_CHESTPLATE.getDefaultInstance(); damagedDiamondChestplate.setDamageValue(500); @@ -71,7 +70,7 @@ public static void shouldExportItem(final GameTestHelper helper) { @GameTest(template = "empty_15x15") public static void shouldExportItemWithStackUpgrade(final GameTestHelper helper) { - preparePlot(helper, Blocks.CHEST, Direction.EAST, (exporter, pos, sequence) -> { + ExporterTestPlots.preparePlot(helper, Blocks.CHEST, Direction.EAST, (exporter, pos, sequence) -> { // Arrange sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { insert(helper, network, DIRT, 65); @@ -115,7 +114,7 @@ public static void shouldExportItemWithStackUpgrade(final GameTestHelper helper) @GameTest(template = "empty_15x15") public static void shouldExportItemFuzzy(final GameTestHelper helper) { - preparePlot(helper, Blocks.CHEST, Direction.EAST, (exporter, pos, sequence) -> { + ExporterTestPlots.preparePlot(helper, Blocks.CHEST, Direction.EAST, (exporter, pos, sequence) -> { // Arrange final ItemStack damagedDiamondChestplate = DIAMOND_CHESTPLATE.getDefaultInstance(); damagedDiamondChestplate.setDamageValue(500); @@ -151,7 +150,7 @@ public static void shouldExportItemFuzzy(final GameTestHelper helper) { @GameTest(template = "empty_15x15") public static void shouldExportFluid(final GameTestHelper helper) { - preparePlot(helper, Blocks.CAULDRON, Direction.EAST, (exporter, pos, sequence) -> { + ExporterTestPlots.preparePlot(helper, Blocks.CAULDRON, Direction.EAST, (exporter, pos, sequence) -> { // Arrange sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { insert(helper, network, DIRT, 10); @@ -179,7 +178,7 @@ public static void shouldExportFluid(final GameTestHelper helper) { @GameTest(template = "empty_15x15") public static void shouldExportFluidWithStackUpgrade(final GameTestHelper helper) { - preparePlot(helper, RSBLOCKS.getInterface(), Direction.EAST, (exporter, pos, sequence) -> { + ExporterTestPlots.preparePlot(helper, RSBLOCKS.getInterface(), Direction.EAST, (exporter, pos, sequence) -> { // Arrange sequence.thenWaitUntil(networkIsAvailable(helper, pos, network -> { insert(helper, network, DIRT, 10); diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTestPlots.java b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/exporter/ExporterTestPlots.java similarity index 77% rename from refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTestPlots.java rename to refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/exporter/ExporterTestPlots.java index 9eefb3773..3ceb1ed51 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTestPlots.java +++ b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/exporter/ExporterTestPlots.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage.platform.common.exporter; +package com.refinedmods.refinedstorage.common.exporter; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; +import com.refinedmods.refinedstorage.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.common.storage.ItemStorageVariant; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -10,8 +10,8 @@ import net.minecraft.world.level.block.Block; import org.apache.commons.lang3.function.TriConsumer; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.RSBLOCKS; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.requireBlockEntity; +import static com.refinedmods.refinedstorage.common.GameTestUtil.RSBLOCKS; +import static com.refinedmods.refinedstorage.common.GameTestUtil.requireBlockEntity; import static net.minecraft.core.BlockPos.ZERO; final class ExporterTestPlots { diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTest.java b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/importer/ImporterTest.java similarity index 91% rename from refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTest.java rename to refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/importer/ImporterTest.java index 1cfe5ebd8..409126da3 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTest.java +++ b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/importer/ImporterTest.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.platform.common.importer; +package com.refinedmods.refinedstorage.common.importer; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage.platform.common.Platform; -import com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.util.IdentifierUtil; import java.util.Set; @@ -16,17 +16,17 @@ import net.neoforged.neoforge.gametest.GameTestHolder; import net.neoforged.neoforge.gametest.PrefixGameTestTemplate; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.RSITEMS; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.asResource; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.assertInterfaceEmpty; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.containerContainsExactly; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.insert; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.interfaceContainsExactly; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.networkIsAvailable; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.storageContainsExactly; -import static com.refinedmods.refinedstorage.platform.common.importer.ImporterTestPlots.prepareChest; -import static com.refinedmods.refinedstorage.platform.common.importer.ImporterTestPlots.prepareInterface; -import static com.refinedmods.refinedstorage.platform.common.importer.ImporterTestPlots.preparePlot; +import static com.refinedmods.refinedstorage.common.GameTestUtil.RSITEMS; +import static com.refinedmods.refinedstorage.common.GameTestUtil.asResource; +import static com.refinedmods.refinedstorage.common.GameTestUtil.assertInterfaceEmpty; +import static com.refinedmods.refinedstorage.common.GameTestUtil.containerContainsExactly; +import static com.refinedmods.refinedstorage.common.GameTestUtil.insert; +import static com.refinedmods.refinedstorage.common.GameTestUtil.interfaceContainsExactly; +import static com.refinedmods.refinedstorage.common.GameTestUtil.networkIsAvailable; +import static com.refinedmods.refinedstorage.common.GameTestUtil.storageContainsExactly; +import static com.refinedmods.refinedstorage.common.importer.ImporterTestPlots.prepareChest; +import static com.refinedmods.refinedstorage.common.importer.ImporterTestPlots.prepareInterface; +import static com.refinedmods.refinedstorage.common.importer.ImporterTestPlots.preparePlot; import static net.minecraft.world.item.Items.COBBLESTONE; import static net.minecraft.world.item.Items.DIAMOND_CHESTPLATE; import static net.minecraft.world.item.Items.DIRT; diff --git a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTestPlots.java b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/importer/ImporterTestPlots.java similarity index 81% rename from refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTestPlots.java rename to refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/importer/ImporterTestPlots.java index 54d6dda48..9c07f625c 100644 --- a/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTestPlots.java +++ b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/importer/ImporterTestPlots.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage.platform.common.importer; +package com.refinedmods.refinedstorage.common.importer; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.platform.common.iface.ExportedResourcesContainer; -import com.refinedmods.refinedstorage.platform.common.iface.InterfaceBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageVariant; -import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageVariant; +import com.refinedmods.refinedstorage.common.iface.ExportedResourcesContainer; +import com.refinedmods.refinedstorage.common.iface.InterfaceBlockEntity; +import com.refinedmods.refinedstorage.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.common.storage.ItemStorageVariant; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -15,8 +15,8 @@ import net.minecraft.world.level.block.entity.BaseContainerBlockEntity; import org.apache.commons.lang3.function.TriConsumer; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.RSBLOCKS; -import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.requireBlockEntity; +import static com.refinedmods.refinedstorage.common.GameTestUtil.RSBLOCKS; +import static com.refinedmods.refinedstorage.common.GameTestUtil.requireBlockEntity; import static net.minecraft.core.BlockPos.ZERO; final class ImporterTestPlots { diff --git a/refinedstorage-platform-neoforge/src/test/resources/data/refinedstorage/structure/empty_15x15.nbt b/refinedstorage-neoforge/src/test/resources/data/refinedstorage/structure/empty_15x15.nbt similarity index 100% rename from refinedstorage-platform-neoforge/src/test/resources/data/refinedstorage/structure/empty_15x15.nbt rename to refinedstorage-neoforge/src/test/resources/data/refinedstorage/structure/empty_15x15.nbt diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/package-info.java deleted file mode 100644 index 6a27901c4..000000000 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.security; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/channel/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/channel/package-info.java deleted file mode 100644 index f4fe1639f..000000000 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/channel/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.storage.channel; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/externalstorage/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/externalstorage/package-info.java deleted file mode 100644 index 9484f511b..000000000 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/externalstorage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.storage.externalstorage; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/package-info.java deleted file mode 100644 index 7f362e5db..000000000 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.storagemonitor; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/package-info.java deleted file mode 100644 index b08e1e454..000000000 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.support.energy; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/package-info.java deleted file mode 100644 index 86700ed4f..000000000 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.support.network.bounditem; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/package-info.java deleted file mode 100644 index 7ae69f978..000000000 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.support.network; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/registry/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/registry/package-info.java deleted file mode 100644 index eb299fc7e..000000000 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/registry/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.support.registry; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/list/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/list/package-info.java deleted file mode 100644 index 9e1d45101..000000000 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/list/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.support.resource.list; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/package-info.java deleted file mode 100644 index c8c9eb497..000000000 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.support.resource; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/slotreference/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/slotreference/package-info.java deleted file mode 100644 index 44928fbd8..000000000 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/slotreference/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.support.slotreference; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/package-info.java deleted file mode 100644 index fb5602034..000000000 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.upgrade; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/package-info.java deleted file mode 100644 index 3fdb688d4..000000000 --- a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.api.wirelesstransmitter; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/package-info.java deleted file mode 100644 index 1bd7a4c31..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.configurationcard; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/package-info.java deleted file mode 100644 index e56d19073..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.constructordestructor; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/package-info.java deleted file mode 100644 index 98aa40e05..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.content; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerType.java deleted file mode 100644 index b3dcad21d..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerType.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.refinedmods.refinedstorage.platform.common.controller; - -public enum ControllerType { - NORMAL, - CREATIVE -} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/package-info.java deleted file mode 100644 index 9d81fbf36..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.grid; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/package-info.java deleted file mode 100644 index 9045ae5be..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.grid.screen.hint; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/package-info.java deleted file mode 100644 index 9ce18ebcd..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.grid.screen; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridScrollingStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridScrollingStrategy.java deleted file mode 100644 index cf3eeae92..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridScrollingStrategy.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.refinedmods.refinedstorage.platform.common.grid.strategy; - -import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; - -public class ClientGridScrollingStrategy implements GridScrollingStrategy { - @Override - public boolean onScroll(final PlatformResourceKey resource, final GridScrollMode scrollMode, final int slotIndex) { - C2SPackets.sendGridScroll(resource, scrollMode, slotIndex); - return true; - } -} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/package-info.java deleted file mode 100644 index 77d1e27d2..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.grid.strategy; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/package-info.java deleted file mode 100644 index 8b82a4638..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.iface; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/package-info.java deleted file mode 100644 index 8beeae0a5..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.misc; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/package-info.java deleted file mode 100644 index d3d6c5954..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.networking; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/package-info.java deleted file mode 100644 index 5969eb633..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.storage.diskdrive; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/package-info.java deleted file mode 100644 index a7e3a6fd5..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.storage.diskinterface; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/package-info.java deleted file mode 100644 index bc6a6ba23..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.storage.externalstorage; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/package-info.java deleted file mode 100644 index 5f48a4196..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.storage; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockItemRenderInfo.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockItemRenderInfo.java deleted file mode 100644 index 622e5ff67..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockItemRenderInfo.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; - -import com.refinedmods.refinedstorage.platform.common.storage.Disk; - -public record PortableGridBlockItemRenderInfo(boolean active, Disk disk) { -} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridType.java deleted file mode 100644 index d918199a9..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridType.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; - -public enum PortableGridType { - NORMAL, - CREATIVE -} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/package-info.java deleted file mode 100644 index 1e9358339..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/package-info.java deleted file mode 100644 index 6326547d9..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.storage.storageblock; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/package-info.java deleted file mode 100644 index 448222b1e..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.storage.storagedisk; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/package-info.java deleted file mode 100644 index defbc00e2..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.storagemonitor; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/CableShapeCacheKey.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/CableShapeCacheKey.java deleted file mode 100644 index 1b28030d5..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/CableShapeCacheKey.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.refinedmods.refinedstorage.platform.common.support; - -import net.minecraft.world.level.block.state.BlockState; - -import static com.refinedmods.refinedstorage.platform.common.support.CableBlockSupport.DOWN; -import static com.refinedmods.refinedstorage.platform.common.support.CableBlockSupport.EAST; -import static com.refinedmods.refinedstorage.platform.common.support.CableBlockSupport.NORTH; -import static com.refinedmods.refinedstorage.platform.common.support.CableBlockSupport.SOUTH; -import static com.refinedmods.refinedstorage.platform.common.support.CableBlockSupport.UP; -import static com.refinedmods.refinedstorage.platform.common.support.CableBlockSupport.WEST; - -public record CableShapeCacheKey(boolean north, boolean east, boolean south, boolean west, boolean up, boolean down) { - public static CableShapeCacheKey of(final BlockState state) { - return new CableShapeCacheKey( - state.getValue(NORTH), - state.getValue(EAST), - state.getValue(SOUTH), - state.getValue(WEST), - state.getValue(UP), - state.getValue(DOWN) - ); - } -} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/package-info.java deleted file mode 100644 index 6f5b1def1..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.support.amount; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/package-info.java deleted file mode 100644 index 98f7ca00b..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.support.containermenu; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/package-info.java deleted file mode 100644 index aa86018fd..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.support.direction; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/package-info.java deleted file mode 100644 index 6fb3511ab..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.support.energy; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/package-info.java deleted file mode 100644 index b3a507768..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.support.network.bounditem; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/component/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/component/package-info.java deleted file mode 100644 index af74c55be..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/component/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.support.network.component; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/package-info.java deleted file mode 100644 index 73a63e93d..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.support.network; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/package-info.java deleted file mode 100644 index b8dc97c84..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.support; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/package-info.java deleted file mode 100644 index 03a90e6ba..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/package-info.java deleted file mode 100644 index ee49a1cad..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.support.packet; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/package-info.java deleted file mode 100644 index 7696751fd..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/registry/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/registry/package-info.java deleted file mode 100644 index f1fea47b4..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/registry/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.support.registry; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/package-info.java deleted file mode 100644 index 8d1651457..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.support.render; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/package-info.java deleted file mode 100644 index 4690dea16..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.support.resource.list; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/package-info.java deleted file mode 100644 index 0c60b6476..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.support.resource; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/slotreference/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/slotreference/package-info.java deleted file mode 100644 index e88132e07..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/slotreference/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.support.slotreference; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/package-info.java deleted file mode 100644 index 1972d0580..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.support.stretching; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/package-info.java deleted file mode 100644 index cddbc8150..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.support.tooltip; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/package-info.java deleted file mode 100644 index 68c7eb13d..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.support.widget; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/package-info.java deleted file mode 100644 index 96d9a930a..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.upgrade; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/package-info.java deleted file mode 100644 index 24a9fbff9..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.util; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/BaseWirelessTransmitterRangeModifier.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/BaseWirelessTransmitterRangeModifier.java deleted file mode 100644 index 2929a9f7f..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/BaseWirelessTransmitterRangeModifier.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; - -import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; -import com.refinedmods.refinedstorage.platform.common.Platform; - -public class BaseWirelessTransmitterRangeModifier implements WirelessTransmitterRangeModifier { - @Override - public int modifyRange(final UpgradeState upgradeState, final int range) { - return Platform.INSTANCE.getConfig().getWirelessTransmitter().getBaseRange() + range; - } -} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/package-info.java deleted file mode 100644 index 6b102d3f7..000000000 --- a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/exporter/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/exporter/package-info.java deleted file mode 100644 index 4c99249a9..000000000 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/exporter/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.fabric.exporter; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/package-info.java deleted file mode 100644 index a9269ac18..000000000 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.fabric.grid.strategy; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/package-info.java deleted file mode 100644 index a38cc6870..000000000 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.fabric.importer; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/package-info.java deleted file mode 100644 index 515cc2dd4..000000000 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.fabric.mixin; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/modmenu/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/modmenu/package-info.java deleted file mode 100644 index 6f7aff03b..000000000 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/modmenu/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.fabric.modmenu; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/security/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/security/package-info.java deleted file mode 100644 index 3cd0fc46c..000000000 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/security/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.fabric.security; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/package-info.java deleted file mode 100644 index 0563688e5..000000000 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.fabric.storage.diskdrive; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/package-info.java deleted file mode 100644 index f8d38dad1..000000000 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.fabric.storage.diskinterface; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/externalstorage/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/externalstorage/package-info.java deleted file mode 100644 index fa307419d..000000000 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/externalstorage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.fabric.storage.externalstorage; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/package-info.java deleted file mode 100644 index 92c7b2d5c..000000000 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.fabric.storage; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/package-info.java deleted file mode 100644 index 72a06528a..000000000 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.fabric.storage.portablegrid; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/package-info.java deleted file mode 100644 index 8f6acc4f8..000000000 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.fabric.support.containermenu; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/energy/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/energy/package-info.java deleted file mode 100644 index d7b563bc1..000000000 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/energy/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.fabric.support.energy; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/package-info.java deleted file mode 100644 index f8f7bbe5f..000000000 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.fabric.support.render; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/package-info.java deleted file mode 100644 index 4aecb33f9..000000000 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.fabric.support.resource; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/util/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/util/package-info.java deleted file mode 100644 index 3a3f8bc11..000000000 --- a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/util/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.fabric.util; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/resources/refinedstorage.mixins.json b/refinedstorage-platform-fabric/src/main/resources/refinedstorage.mixins.json deleted file mode 100644 index bf26e41ac..000000000 --- a/refinedstorage-platform-fabric/src/main/resources/refinedstorage.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "com.refinedmods.refinedstorage.platform.fabric.mixin", - "compatibilityLevel": "JAVA_17", - "client": [ - "AbstractModelBakerImplMixin", - "EditBoxAccessor", - "ItemPropertiesAccessor", - "KeyMappingAccessor", - "ModelBakeryAccessor" - ], - "injectors": { - "defaultRequire": 1 - } -} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/loot/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/loot/package-info.java deleted file mode 100644 index 9bc99f9e5..000000000 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/loot/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.neoforge.datagen.loot; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/recipe/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/recipe/package-info.java deleted file mode 100644 index d2939e72c..000000000 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/recipe/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.neoforge.datagen.recipe; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/package-info.java deleted file mode 100644 index 9ffb1ad2f..000000000 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.neoforge.datagen.tag; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/package-info.java deleted file mode 100644 index 20d03298c..000000000 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.neoforge.exporter; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/package-info.java deleted file mode 100644 index df7c35c37..000000000 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.neoforge.grid.strategy; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/package-info.java deleted file mode 100644 index ae8c40a5e..000000000 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.neoforge.grid.view; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/package-info.java deleted file mode 100644 index 83c3211a2..000000000 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.neoforge.importer; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/package-info.java deleted file mode 100644 index e7e6917db..000000000 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.neoforge; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java deleted file mode 100644 index ca777044d..000000000 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage.diskdrive; - -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntityRenderer; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.RenderTypes; - -public class DiskDriveBlockEntityRendererImpl - extends AbstractDiskDriveBlockEntityRenderer { - public DiskDriveBlockEntityRendererImpl() { - super(RenderTypes.DISK_LED); - } - - @Override - protected Disk[] getDisks(final AbstractDiskDriveBlockEntity blockEntity) { - return blockEntity.getModelData().get(ForgeDiskDriveBlockEntity.DISKS_PROPERTY); - } -} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/package-info.java deleted file mode 100644 index 4050fcfcb..000000000 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.neoforge.storage.diskdrive; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java deleted file mode 100644 index 1e4adf49d..000000000 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.refinedmods.refinedstorage.platform.neoforge.storage.diskinterface; - -import com.refinedmods.refinedstorage.platform.common.storage.Disk; -import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; -import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntityRenderer; -import com.refinedmods.refinedstorage.platform.neoforge.support.render.RenderTypes; - -public class DiskInterfaceBlockEntityRendererImpl - extends AbstractDiskInterfaceBlockEntityRenderer { - public DiskInterfaceBlockEntityRendererImpl() { - super(RenderTypes.DISK_LED); - } - - @Override - protected Disk[] getDisks(final AbstractDiskInterfaceBlockEntity blockEntity) { - return blockEntity.getModelData().get(ForgeDiskInterfaceBlockEntity.DISKS_PROPERTY); - } -} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/package-info.java deleted file mode 100644 index 2ebdb0cfa..000000000 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.neoforge.storage.diskinterface; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/package-info.java deleted file mode 100644 index 5d55cb170..000000000 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.neoforge.storage.externalstorage; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/package-info.java deleted file mode 100644 index c721b6141..000000000 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.neoforge.storage.portablegrid; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/package-info.java deleted file mode 100644 index 0d92a442e..000000000 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.neoforge.support.containermenu; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/energy/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/energy/package-info.java deleted file mode 100644 index 59b8b4647..000000000 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/energy/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.neoforge.support.energy; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/inventory/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/inventory/package-info.java deleted file mode 100644 index d0db718c9..000000000 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/inventory/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.neoforge.support.inventory; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/package-info.java deleted file mode 100644 index d4aac3d9a..000000000 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.neoforge.support.render; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/package-info.java deleted file mode 100644 index 8ea903117..000000000 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.platform.neoforge.support.resource; - -import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImplTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImplTest.java index 5fadc5baf..072a28d37 100644 --- a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImplTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImplTest.java @@ -228,7 +228,7 @@ void shouldBeAbleToRetrieveResource() { } @Test - @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug + @SuppressWarnings("AssertBetweenInconvertibleTypes") void shouldBeAbleToRetrieveTrackedResource() { // Arrange final Storage storage = new TrackedStorageImpl( diff --git a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorageImplTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorageImplTest.java index f41a038cc..c876a5500 100644 --- a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorageImplTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorageImplTest.java @@ -136,7 +136,7 @@ void shouldNotTrackResourceByInsertingToAlreadyFullStorage(final Action action) @ParameterizedTest @EnumSource(Action.class) - @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug + @SuppressWarnings("AssertBetweenInconvertibleTypes") void shouldTrackResourceByExtracting(final Action action) { // Arrange backed.insert(A, 100, Action.EXECUTE, EmptyActor.INSTANCE); @@ -173,7 +173,7 @@ void shouldNotTrackResourceByExtractingNothing(final Action action) { } @Test - @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug + @SuppressWarnings("AssertBetweenInconvertibleTypes") void shouldTrackMultipleResources() { // Act sut.insert(A, 1, Action.EXECUTE, FakeActors.FakeActor1.INSTANCE); @@ -195,7 +195,7 @@ void shouldTrackMultipleResources() { class UpdateTrackedResourceTest { @ParameterizedTest @EnumSource(Action.class) - @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug + @SuppressWarnings("AssertBetweenInconvertibleTypes") void shouldUpdateTrackedResourceByInserting(final Action action) { // Act sut.insert(A, 50, Action.EXECUTE, FakeActors.FakeActor1.INSTANCE); @@ -217,7 +217,7 @@ void shouldUpdateTrackedResourceByInserting(final Action action) { @ParameterizedTest @EnumSource(Action.class) - @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug + @SuppressWarnings("AssertBetweenInconvertibleTypes") void shouldNotUpdateTrackedResourceByInsertingToAnAlreadyFullStorage(final Action action) { // Act sut.insert(A, 100, Action.EXECUTE, FakeActors.FakeActor1.INSTANCE); @@ -232,7 +232,7 @@ void shouldNotUpdateTrackedResourceByInsertingToAnAlreadyFullStorage(final Actio @ParameterizedTest @EnumSource(Action.class) - @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug + @SuppressWarnings("AssertBetweenInconvertibleTypes") void shouldUpdateTrackedResourceByExtracting(final Action action) { // Arrange backed.insert(A, 100, Action.EXECUTE, EmptyActor.INSTANCE); @@ -257,7 +257,7 @@ void shouldUpdateTrackedResourceByExtracting(final Action action) { @ParameterizedTest @EnumSource(Action.class) - @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug + @SuppressWarnings("AssertBetweenInconvertibleTypes") void shouldNotUpdateTrackedResourceByExtractingNothing(final Action action) { // Arrange backed.insert(A, 100, Action.EXECUTE, EmptyActor.INSTANCE); @@ -274,7 +274,7 @@ void shouldNotUpdateTrackedResourceByExtractingNothing(final Action action) { } @Test - @SuppressWarnings("AssertBetweenInconvertibleTypes") // intellij bug + @SuppressWarnings("AssertBetweenInconvertibleTypes") void shouldBeAbleToUpdateMultipleTrackedResources() { // Act sut.insert(A, 1, Action.EXECUTE, FakeActors.FakeActor1.INSTANCE); diff --git a/settings.gradle.kts b/settings.gradle.kts index 4b89d8139..cf208682a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -50,8 +50,8 @@ include("refinedstorage-query-parser") include("refinedstorage-grid-api") include("refinedstorage-network-api") include("refinedstorage-network") -include("refinedstorage-platform-api") -include("refinedstorage-platform-fabric") -include("refinedstorage-platform-neoforge") -include("refinedstorage-platform-common") +include("refinedstorage-common-api") +include("refinedstorage-common") +include("refinedstorage-fabric") +include("refinedstorage-neoforge") include("refinedstorage-network-test") From 0e80e96843db61cbb2b5148ffe5d1d35d7a9fdb9 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Mon, 22 Jul 2024 09:23:57 +0200 Subject: [PATCH 27/36] chore: update git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 0f3897062..cc101574f 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -2,3 +2,5 @@ # Rename "refinedstorage2" to "refinedstorage" 03d02f1e07e1e6e9726404c236c3af227126ade0 +# Remove "platform" prefix from modules +328e1bfeb40342a81c375da4a5f75c9a36fe8ef8 From 82a6ace1330f312feacdd73cb23a0d7a94b969da Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Mon, 22 Jul 2024 11:02:21 +0200 Subject: [PATCH 28/36] refactor: minor renames for constructor / destructor strategies --- .../constructordestructor/ConstructorStrategy.java | 2 +- .../api/constructordestructor/DestructorStrategy.java | 11 +---------- .../AbstractItemConstructorStrategy.java | 4 ++-- .../BlockBreakDestructorStrategy.java | 10 +++++----- .../CompositeConstructorStrategy.java | 4 ++-- .../CompositeDestructorStrategy.java | 4 ++-- .../FluidBreakDestructorStrategy.java | 4 ++-- .../ItemPickupDestructorStrategy.java | 2 +- .../PlaceFluidConstructorStrategy.java | 4 ++-- 9 files changed, 18 insertions(+), 27 deletions(-) diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/ConstructorStrategy.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/ConstructorStrategy.java index cafed3938..b6ba506cb 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/ConstructorStrategy.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/ConstructorStrategy.java @@ -10,5 +10,5 @@ @API(status = API.Status.STABLE, since = "2.0.0-milestone.2.11") @FunctionalInterface public interface ConstructorStrategy { - boolean apply(ResourceKey resource, Actor actor, Player actingPlayer, Network network); + boolean apply(ResourceKey resource, Actor actor, Player player, Network network); } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/DestructorStrategy.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/DestructorStrategy.java index c974e6b2f..a3ba6a2b7 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/DestructorStrategy.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/constructordestructor/DestructorStrategy.java @@ -12,14 +12,5 @@ @API(status = API.Status.STABLE, since = "2.0.0-milestone.2.10") @FunctionalInterface public interface DestructorStrategy { - /** - * Tries to perform the destructor operation. - * - * @param filter the filter - * @param actor the actor - * @param networkSupplier the network, this network can change due to a destruction operation hence the supplier - * @param actingPlayer the fake player - * @return true if the operation was successful and lower prioritized strategies should be ignored, false otherwise - */ - boolean apply(Filter filter, Actor actor, Supplier networkSupplier, Player actingPlayer); + boolean apply(Filter filter, Actor actor, Supplier networkSupplier, Player player); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractItemConstructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractItemConstructorStrategy.java index 40d159c4c..6de3c4127 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractItemConstructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractItemConstructorStrategy.java @@ -34,7 +34,7 @@ protected long getTransferAmount() { public final boolean apply( final ResourceKey resource, final Actor actor, - final Player actingPlayer, + final Player player, final Network network ) { if (!level.isLoaded(pos)) { @@ -50,7 +50,7 @@ public final boolean apply( return false; } final ItemStack itemStack = itemResource.toItemStack(extractedAmount); - final boolean success = apply(itemStack, actor, actingPlayer); + final boolean success = apply(itemStack, actor, player); if (success) { storageChannel.extract(itemResource, extractedAmount, Action.EXECUTE, actor); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/BlockBreakDestructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/BlockBreakDestructorStrategy.java index c03b343ce..d4f4e3b67 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/BlockBreakDestructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/BlockBreakDestructorStrategy.java @@ -45,7 +45,7 @@ class BlockBreakDestructorStrategy implements DestructorStrategy { public boolean apply(final Filter filter, final Actor actor, final Supplier networkSupplier, - final Player actingPlayer) { + final Player player) { if (!level.isLoaded(pos)) { return false; } @@ -53,8 +53,8 @@ public boolean apply(final Filter filter, final Block block = blockState.getBlock(); if (isFastExit(blockState) || blockState.getDestroySpeed(level, pos) == -1.0 - || !isAllowed(actingPlayer, filter, blockState, block) - || !Platform.INSTANCE.canBreakBlock(level, pos, blockState, actingPlayer)) { + || !isAllowed(player, filter, blockState, block) + || !Platform.INSTANCE.canBreakBlock(level, pos, blockState, player)) { return false; } final List drops = Block.getDrops( @@ -62,13 +62,13 @@ public boolean apply(final Filter filter, level, pos, level.getBlockEntity(pos), - actingPlayer, + player, tool ); if (!insertDrops(actor, drops, getStorageChannel(networkSupplier), Action.SIMULATE)) { return false; } - block.playerWillDestroy(level, pos, blockState, actingPlayer); + block.playerWillDestroy(level, pos, blockState, player); level.removeBlock(pos, false); insertDrops(actor, drops, getStorageChannel(networkSupplier), Action.EXECUTE); return true; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/CompositeConstructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/CompositeConstructorStrategy.java index cfcae4456..fa605dab6 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/CompositeConstructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/CompositeConstructorStrategy.java @@ -20,10 +20,10 @@ class CompositeConstructorStrategy implements ConstructorStrategy { @Override public boolean apply(final ResourceKey resource, final Actor actor, - final Player actingPlayer, + final Player player, final Network network) { for (final ConstructorStrategy strategy : strategies) { - if (strategy.apply(resource, actor, actingPlayer, network)) { + if (strategy.apply(resource, actor, player, network)) { return true; } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/CompositeDestructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/CompositeDestructorStrategy.java index 3320e7af6..47fc8eb0d 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/CompositeDestructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/CompositeDestructorStrategy.java @@ -22,9 +22,9 @@ class CompositeDestructorStrategy implements DestructorStrategy { public boolean apply(final Filter filter, final Actor actor, final Supplier networkSupplier, - final Player actingPlayer) { + final Player player) { for (final DestructorStrategy strategy : strategies) { - if (strategy.apply(filter, actor, networkSupplier, actingPlayer)) { + if (strategy.apply(filter, actor, networkSupplier, player)) { return true; } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/FluidBreakDestructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/FluidBreakDestructorStrategy.java index 5e6cc176f..dfda907cc 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/FluidBreakDestructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/FluidBreakDestructorStrategy.java @@ -35,7 +35,7 @@ class FluidBreakDestructorStrategy implements DestructorStrategy { public boolean apply(final Filter filter, final Actor actor, final Supplier networkSupplier, - final Player actingPlayer) { + final Player player) { if (!level.isLoaded(pos)) { return false; } @@ -49,7 +49,7 @@ public boolean apply(final Filter filter, if (!filter.isAllowed(fluidResource)) { return false; } - return tryInsert(actor, networkSupplier, actingPlayer, blockState, liquidBlock, fluidResource); + return tryInsert(actor, networkSupplier, player, blockState, liquidBlock, fluidResource); } private boolean tryInsert(final Actor actor, diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ItemPickupDestructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ItemPickupDestructorStrategy.java index 9a7e11037..dc14ed827 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ItemPickupDestructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ItemPickupDestructorStrategy.java @@ -32,7 +32,7 @@ class ItemPickupDestructorStrategy implements DestructorStrategy { public boolean apply(final Filter filter, final Actor actor, final Supplier networkSupplier, - final Player actingPlayer) { + final Player player) { if (!level.isLoaded(pos)) { return false; } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/PlaceFluidConstructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/PlaceFluidConstructorStrategy.java index 34491e68a..b4e4c3bce 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/PlaceFluidConstructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/PlaceFluidConstructorStrategy.java @@ -30,7 +30,7 @@ public PlaceFluidConstructorStrategy(final ServerLevel level, final BlockPos pos public boolean apply( final ResourceKey resource, final Actor actor, - final Player actingPlayer, + final Player player, final Network network ) { if (!level.isLoaded(pos)) { @@ -50,7 +50,7 @@ public boolean apply( if (bucketAmount != extractedAmount) { return false; } - final boolean success = Platform.INSTANCE.placeFluid(level, pos, direction, actingPlayer, fluidResource); + final boolean success = Platform.INSTANCE.placeFluid(level, pos, direction, player, fluidResource); if (success) { storageChannel.extract(fluidResource, bucketAmount, Action.EXECUTE, actor); } From b5492b01b4730bffaa0d9d846007a90fdbc73e8f Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Mon, 22 Jul 2024 11:08:02 +0200 Subject: [PATCH 29/36] refactor: move amount override to support package It's also used by the importer. --- .../ExporterTransferStrategyFactory.java | 1 + .../ImporterTransferStrategyFactory.java | 2 +- .../network}/AmountOverride.java | 10 +++---- .../common/api/upgrade/UpgradeState.java | 4 ++- .../common/exporter/ExporterBlockEntity.java | 6 ++--- .../common/importer/ImporterBlockEntity.java | 6 ++--- .../common/upgrade/UpgradeContainer.java | 5 ---- ...torageExporterTransferStrategyFactory.java | 2 +- .../importer/FabricStorageImporterSource.java | 2 +- ...torageImporterTransferStrategyFactory.java | 2 +- .../FabricStorageExtractableStorage.java | 2 +- .../FabricStorageInsertableStorage.java | 2 +- .../FabricStorageExternalStorageProvider.java | 2 +- ...andlerExporterTransferStrategyFactory.java | 2 +- ...andlerExporterTransferStrategyFactory.java | 2 +- .../strategy/ItemGridExtractionStrategy.java | 2 +- .../strategy/ItemGridInsertionStrategy.java | 2 +- .../strategy/ItemGridScrollingStrategy.java | 2 +- .../importer/FluidHandlerImporterSource.java | 2 +- ...andlerImporterTransferStrategyFactory.java | 2 +- .../importer/ItemHandlerImporterSource.java | 2 +- ...andlerImporterTransferStrategyFactory.java | 2 +- .../FluidHandlerExtractableStorage.java | 2 +- .../FluidHandlerInsertableStorage.java | 2 +- .../ItemHandlerExtractableStorage.java | 2 +- .../storage/ItemHandlerInsertableStorage.java | 27 +++++++++---------- .../FluidHandlerExternalStorageProvider.java | 2 +- .../ItemHandlerExternalStorageProvider.java | 2 +- 28 files changed, 48 insertions(+), 53 deletions(-) rename refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/{exporter => support/network}/AmountOverride.java (56%) diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/exporter/ExporterTransferStrategyFactory.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/exporter/ExporterTransferStrategyFactory.java index 7b9f473a0..7e423a3bd 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/exporter/ExporterTransferStrategyFactory.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/exporter/ExporterTransferStrategyFactory.java @@ -1,6 +1,7 @@ package com.refinedmods.refinedstorage.common.api.exporter; import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import net.minecraft.core.BlockPos; diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/importer/ImporterTransferStrategyFactory.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/importer/ImporterTransferStrategyFactory.java index 9a0ca18bf..8768c37cd 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/importer/ImporterTransferStrategyFactory.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/importer/ImporterTransferStrategyFactory.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.common.api.importer; import com.refinedmods.refinedstorage.api.network.node.importer.ImporterTransferStrategy; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import net.minecraft.core.BlockPos; diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/exporter/AmountOverride.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/AmountOverride.java similarity index 56% rename from refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/exporter/AmountOverride.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/AmountOverride.java index 922f4a145..7a4ffb7de 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/exporter/AmountOverride.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/AmountOverride.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.common.api.exporter; +package com.refinedmods.refinedstorage.common.api.support.network; import com.refinedmods.refinedstorage.api.resource.ResourceKey; @@ -14,10 +14,10 @@ public interface AmountOverride { /** * Modifies the requested amount to a new amount. * - * @param resource the resource - * @param amount the original requested amount - * @param currentAmount the current amount present in the source + * @param resource the resource + * @param desiredAmount the original requested amount + * @param currentAmountSupplier the current amount present in the source * @return the new requested amount, may be 0 */ - long overrideAmount(ResourceKey resource, long amount, LongSupplier currentAmount); + long overrideAmount(ResourceKey resource, long desiredAmount, LongSupplier currentAmountSupplier); } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeState.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeState.java index df672beac..d603d5db1 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeState.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeState.java @@ -4,7 +4,9 @@ @API(status = API.Status.STABLE, since = "2.0.0-milestone.2.10") public interface UpgradeState { - boolean has(UpgradeItem upgradeItem); + default boolean has(UpgradeItem upgradeItem) { + return getAmount(upgradeItem) > 0; + } int getAmount(UpgradeItem upgradeItem); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterBlockEntity.java index 3c55fc645..4179ee557 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterBlockEntity.java @@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.common.Platform; import com.refinedmods.refinedstorage.common.api.PlatformApi; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.exporter.ExporterTransferStrategyFactory; import com.refinedmods.refinedstorage.common.content.BlockEntities; import com.refinedmods.refinedstorage.common.content.ContentNames; @@ -100,13 +100,13 @@ protected void setFilters(final List filters) { } @Override - public long overrideAmount(final ResourceKey resource, final long amount, final LongSupplier currentAmount) { + public long overrideAmount(final ResourceKey resource, final long amount, final LongSupplier currentAmountSupplier) { if (!upgradeContainer.has(Items.INSTANCE.getRegulatorUpgrade())) { return amount; } return upgradeContainer.getRegulatedAmount(resource) .stream() - .map(desiredAmount -> getAmountStillNeeded(amount, currentAmount.getAsLong(), desiredAmount)) + .map(desiredAmount -> getAmountStillNeeded(amount, currentAmountSupplier.getAsLong(), desiredAmount)) .findFirst() .orElse(amount); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterBlockEntity.java index a5aae36f9..6547edb49 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterBlockEntity.java @@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; import com.refinedmods.refinedstorage.common.Platform; import com.refinedmods.refinedstorage.common.api.PlatformApi; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.importer.ImporterTransferStrategyFactory; import com.refinedmods.refinedstorage.common.content.BlockEntities; import com.refinedmods.refinedstorage.common.content.ContentNames; @@ -150,13 +150,13 @@ public AbstractContainerMenu createMenu(final int syncId, final Inventory invent @Override public long overrideAmount(final ResourceKey resource, final long amount, - final LongSupplier currentAmount) { + final LongSupplier currentAmountSupplier) { if (!upgradeContainer.has(Items.INSTANCE.getRegulatorUpgrade())) { return amount; } return upgradeContainer.getRegulatedAmount(resource) .stream() - .map(desiredAmount -> getAmountStillAvailableForImport(amount, currentAmount.getAsLong(), desiredAmount)) + .map(desiredAmount -> getAmountStillAvailableForImport(amount, currentAmountSupplier.getAsLong(), desiredAmount)) .findFirst() .orElse(amount); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeContainer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeContainer.java index 819b3dba8..9b1965096 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeContainer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeContainer.java @@ -96,11 +96,6 @@ private void updateIndex(final int slotIndex) { index.put(upgradeItem, index.getInt(upgradeItem) + 1); } - @Override - public boolean has(final UpgradeItem upgradeItem) { - return index.containsKey(upgradeItem); - } - @Override public int getAmount(final UpgradeItem upgradeItem) { return index.getInt(upgradeItem); diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java index cf917427d..c68b46b43 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java @@ -3,7 +3,7 @@ import com.refinedmods.refinedstorage.api.network.impl.node.exporter.ExporterTransferStrategyImpl; import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.exporter.ExporterTransferStrategyFactory; import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import com.refinedmods.refinedstorage.common.content.Items; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/FabricStorageImporterSource.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/FabricStorageImporterSource.java index 968937d65..046d711b8 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/FabricStorageImporterSource.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/FabricStorageImporterSource.java @@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterSource; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.fabric.storage.FabricStorageExtractableStorage; import com.refinedmods.refinedstorage.fabric.storage.FabricStorageInsertableStorage; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/FabricStorageImporterTransferStrategyFactory.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/FabricStorageImporterTransferStrategyFactory.java index f20649ae3..f4707ae97 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/FabricStorageImporterTransferStrategyFactory.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/FabricStorageImporterTransferStrategyFactory.java @@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterTransferStrategyImpl; import com.refinedmods.refinedstorage.api.network.node.importer.ImporterTransferStrategy; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.importer.ImporterTransferStrategyFactory; import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import com.refinedmods.refinedstorage.common.content.Items; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/FabricStorageExtractableStorage.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/FabricStorageExtractableStorage.java index 1082f724c..5fae1ec64 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/FabricStorageExtractableStorage.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/FabricStorageExtractableStorage.java @@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import java.util.function.Function; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/FabricStorageInsertableStorage.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/FabricStorageInsertableStorage.java index 0b308333c..2c3aa9342 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/FabricStorageInsertableStorage.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/FabricStorageInsertableStorage.java @@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import java.util.function.Function; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/externalstorage/FabricStorageExternalStorageProvider.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/externalstorage/FabricStorageExternalStorageProvider.java index 58d8b18e1..939ef2f40 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/externalstorage/FabricStorageExternalStorageProvider.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/externalstorage/FabricStorageExternalStorageProvider.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.fabric.storage.FabricStorageExtractableStorage; import com.refinedmods.refinedstorage.fabric.storage.FabricStorageInsertableStorage; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/FluidHandlerExporterTransferStrategyFactory.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/FluidHandlerExporterTransferStrategyFactory.java index 25334c751..c06cff848 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/FluidHandlerExporterTransferStrategyFactory.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/FluidHandlerExporterTransferStrategyFactory.java @@ -3,7 +3,7 @@ import com.refinedmods.refinedstorage.api.network.impl.node.exporter.ExporterTransferStrategyImpl; import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.exporter.ExporterTransferStrategyFactory; import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import com.refinedmods.refinedstorage.common.content.Items; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/ItemHandlerExporterTransferStrategyFactory.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/ItemHandlerExporterTransferStrategyFactory.java index 5503c8038..26ed97585 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/ItemHandlerExporterTransferStrategyFactory.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/ItemHandlerExporterTransferStrategyFactory.java @@ -2,7 +2,7 @@ import com.refinedmods.refinedstorage.api.network.impl.node.exporter.ExporterTransferStrategyImpl; import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.exporter.ExporterTransferStrategyFactory; import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import com.refinedmods.refinedstorage.common.content.Items; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridExtractionStrategy.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridExtractionStrategy.java index 707361f03..f947bcde0 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridExtractionStrategy.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridExtractionStrategy.java @@ -2,7 +2,7 @@ import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.grid.Grid; import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategy; import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridInsertionStrategy.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridInsertionStrategy.java index b6797edfa..c28d718fb 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridInsertionStrategy.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridInsertionStrategy.java @@ -2,7 +2,7 @@ import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.grid.Grid; import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategy; import com.refinedmods.refinedstorage.common.support.resource.ItemResource; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridScrollingStrategy.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridScrollingStrategy.java index 4a178c8e1..5b83eeea1 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridScrollingStrategy.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridScrollingStrategy.java @@ -3,7 +3,7 @@ import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.grid.Grid; import com.refinedmods.refinedstorage.common.api.grid.GridScrollMode; import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategy; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/FluidHandlerImporterSource.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/FluidHandlerImporterSource.java index 3bec56533..3c181adfd 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/FluidHandlerImporterSource.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/FluidHandlerImporterSource.java @@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCache; import com.refinedmods.refinedstorage.neoforge.storage.FluidHandlerExtractableStorage; import com.refinedmods.refinedstorage.neoforge.storage.FluidHandlerInsertableStorage; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/FluidHandlerImporterTransferStrategyFactory.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/FluidHandlerImporterTransferStrategyFactory.java index eee5eda30..127a9e9e9 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/FluidHandlerImporterTransferStrategyFactory.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/FluidHandlerImporterTransferStrategyFactory.java @@ -3,7 +3,7 @@ import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterSource; import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterTransferStrategyImpl; import com.refinedmods.refinedstorage.api.network.node.importer.ImporterTransferStrategy; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.importer.ImporterTransferStrategyFactory; import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import com.refinedmods.refinedstorage.common.content.Items; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/ItemHandlerImporterSource.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/ItemHandlerImporterSource.java index 8297e263a..ea564b124 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/ItemHandlerImporterSource.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/ItemHandlerImporterSource.java @@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCache; import com.refinedmods.refinedstorage.neoforge.storage.ItemHandlerExtractableStorage; import com.refinedmods.refinedstorage.neoforge.storage.ItemHandlerInsertableStorage; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/ItemHandlerImporterTransferStrategyFactory.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/ItemHandlerImporterTransferStrategyFactory.java index f9c907263..1c63e1786 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/ItemHandlerImporterTransferStrategyFactory.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/ItemHandlerImporterTransferStrategyFactory.java @@ -3,7 +3,7 @@ import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterSource; import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterTransferStrategyImpl; import com.refinedmods.refinedstorage.api.network.node.importer.ImporterTransferStrategy; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.importer.ImporterTransferStrategyFactory; import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import com.refinedmods.refinedstorage.common.content.Items; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/FluidHandlerExtractableStorage.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/FluidHandlerExtractableStorage.java index 73ff60d63..db326d49a 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/FluidHandlerExtractableStorage.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/FluidHandlerExtractableStorage.java @@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.support.resource.FluidResource; import net.neoforged.neoforge.fluids.FluidStack; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/FluidHandlerInsertableStorage.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/FluidHandlerInsertableStorage.java index f5f4b4862..b06bd9db4 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/FluidHandlerInsertableStorage.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/FluidHandlerInsertableStorage.java @@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.support.resource.FluidResource; import net.neoforged.neoforge.fluids.FluidStack; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/ItemHandlerExtractableStorage.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/ItemHandlerExtractableStorage.java index a8e1eb93b..0cb8a5298 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/ItemHandlerExtractableStorage.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/ItemHandlerExtractableStorage.java @@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import net.minecraft.world.item.ItemStack; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/ItemHandlerInsertableStorage.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/ItemHandlerInsertableStorage.java index d7c785cfa..22c52d845 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/ItemHandlerInsertableStorage.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/ItemHandlerInsertableStorage.java @@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import net.minecraft.world.item.ItemStack; @@ -26,20 +26,17 @@ public long insert(final ResourceKey resource, final long amount, final Action a if (!(resource instanceof ItemResource itemResource)) { return 0L; } - return capabilityCache - .getItemHandler() - .map(itemHandler -> { - final long correctedAmount = amountOverride.overrideAmount( - resource, - amount, - () -> ForgeHandlerUtil.getCurrentAmount(itemHandler, itemResource.toItemStack()) - ); - if (correctedAmount == 0) { - return 0L; - } - return doInsert(itemResource, correctedAmount, action, itemHandler); - }) - .orElse(0L); + return capabilityCache.getItemHandler().map(itemHandler -> { + final long correctedAmount = amountOverride.overrideAmount( + resource, + amount, + () -> ForgeHandlerUtil.getCurrentAmount(itemHandler, itemResource.toItemStack()) + ); + if (correctedAmount == 0) { + return 0L; + } + return doInsert(itemResource, correctedAmount, action, itemHandler); + }).orElse(0L); } private long doInsert(final ItemResource resource, diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/FluidHandlerExternalStorageProvider.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/FluidHandlerExternalStorageProvider.java index 794a81dfe..25ea802af 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/FluidHandlerExternalStorageProvider.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/FluidHandlerExternalStorageProvider.java @@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCache; import com.refinedmods.refinedstorage.neoforge.storage.FluidHandlerExtractableStorage; import com.refinedmods.refinedstorage.neoforge.storage.FluidHandlerInsertableStorage; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/ItemHandlerExternalStorageProvider.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/ItemHandlerExternalStorageProvider.java index 3f6bf26e0..d02457605 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/ItemHandlerExternalStorageProvider.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/externalstorage/ItemHandlerExternalStorageProvider.java @@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; -import com.refinedmods.refinedstorage.common.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCache; import com.refinedmods.refinedstorage.neoforge.storage.ItemHandlerExtractableStorage; import com.refinedmods.refinedstorage.neoforge.storage.ItemHandlerInsertableStorage; From 14908e8a8fdc325972821d52aa511da08007a487 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Mon, 22 Jul 2024 11:16:52 +0200 Subject: [PATCH 30/36] refactor: rename storage channel to root storage --- .../decision/010-shared-storage.md | 16 ++-- .../common/api/grid/GridSynchronizer.java | 1 - .../grid/strategy/GridExtractionStrategy.java | 1 + .../grid/strategy/GridScrollingStrategy.java | 1 + .../FuzzyRootStorage.java} | 6 +- .../{channel => root}/package-info.java | 2 +- .../api/support/resource/ResourceType.java | 4 +- .../common/api/upgrade/UpgradeState.java | 1 + .../AbstractItemConstructorStrategy.java | 8 +- .../BlockBreakDestructorStrategy.java | 10 +- .../FluidBreakDestructorStrategy.java | 8 +- .../ItemPickupDestructorStrategy.java | 10 +- .../PlaceFluidConstructorStrategy.java | 8 +- .../detector/FuzzyDetectorAmountStrategy.java | 10 +- .../FuzzyExporterTransferStrategy.java | 12 +-- .../common/grid/AbstractGridBlockEntity.java | 6 +- .../grid/AbstractGridContainerMenu.java | 15 ++- .../common/grid/CraftingGridBlockEntity.java | 12 +-- .../SnapshotCraftingGridRefillContext.java | 20 ++-- .../common/grid/WirelessGrid.java | 8 +- .../iface/ExportedResourcesContainer.java | 10 +- .../storage/portablegrid/PortableGrid.java | 26 +++--- .../portablegrid/PortableGridStorage.java | 14 +-- ...FluidStorageMonitorExtractionStrategy.java | 4 +- .../FluidStorageMonitorInsertionStrategy.java | 16 ++-- .../StorageMonitorBlockEntity.java | 12 +-- .../PlatformStorageNetworkComponent.java | 4 +- .../support/resource/FluidResourceType.java | 6 +- .../support/resource/ItemResourceType.java | 6 +- .../strategy/FluidGridExtractionStrategy.java | 4 +- .../grid/operations/GridOperationsImpl.java | 16 ++-- .../api/grid/watcher/GridWatcherManager.java | 12 +-- .../grid/watcher/GridWatcherManagerImpl.java | 36 ++++---- .../grid/watcher/GridWatcherRegistration.java | 16 ++-- .../grid/service/GridOperationsImplTest.java | 92 +++++++++---------- .../watcher/GridWatcherManagerImplTest.java | 68 +++++++------- .../strategy/FluidGridExtractionStrategy.java | 4 +- .../storage/StorageNetworkComponent.java | 4 +- .../api/network/storage/StorageProvider.java | 3 +- .../AbstractDetectorAmountStrategy.java | 4 +- .../detector/DetectorAmountStrategyImpl.java | 2 +- .../ExporterTransferStrategyImpl.java | 24 ++--- .../impl/node/iface/InterfaceExportState.java | 4 +- .../impl/node/iface/InterfaceNetworkNode.java | 20 ++-- .../ImporterTransferStrategyImpl.java | 20 ++-- .../storage/StorageNetworkComponentImpl.java | 4 +- .../node/iface/InterfaceExportStateImpl.java | 14 +-- .../RootStorage.java} | 14 +-- .../RootStorageImpl.java} | 8 +- .../{channel => root}/package-info.java | 2 +- ... => ExternalStorageInRootStorageTest.java} | 86 ++++++++--------- .../RootStorageImplTest.java} | 8 +- 52 files changed, 361 insertions(+), 361 deletions(-) rename refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/{channel/FuzzyStorageChannel.java => root/FuzzyRootStorage.java} (61%) rename refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/{channel => root}/package-info.java (75%) rename refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/{channel/StorageChannel.java => root/RootStorage.java} (79%) rename refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/{channel/StorageChannelImpl.java => root/RootStorageImpl.java} (93%) rename refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/{channel => root}/package-info.java (77%) rename refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/{StorageChannelExternalStorageTest.java => ExternalStorageInRootStorageTest.java} (68%) rename refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/{channel/StorageChannelImplTest.java => root/RootStorageImplTest.java} (98%) diff --git a/doc/architecture/decision/010-shared-storage.md b/doc/architecture/decision/010-shared-storage.md index 35374b024..6d251a443 100644 --- a/doc/architecture/decision/010-shared-storage.md +++ b/doc/architecture/decision/010-shared-storage.md @@ -8,34 +8,34 @@ Accepted ## Context -Refined Storage has the concept of a storage channel. A storage channel is the highest-level storage of a network. It +Refined Storage has the concept of a root storage. A root storage is the highest-level storage of a network. It is used by other network devices to interact with the storage network. As Refined Storage supports multiple resource types, we must decide how we partition those resource types. ## Decision -At the lowest level, we allow mixed resource types within a storage. Since a storage channel is a storage as well, this -means that the highest level, the storage channel, will allow mixed resource types as well. +At the lowest level, we allow mixed resource types within a storage. Since a root storage is a storage as well, this +means that the highest level, the root storage, will allow mixed resource types as well. We don't partition storages by resource type because: - This implies the use of a generic type on the `Storage` class, which becomes cumbersome quickly when we don't know the resource type at runtime (relying on unchecked and rawtypes operations). -- There's no real technical reason to partition storages by resource type. We can have a single storage channel with +- There's no real technical reason to partition storages by resource type. We can have a single root storage with mixed resource types. -- If there is a single storage channel, blocks like the Disk Drive don't need to maintain a storage per storage channel. - They can expose one storage for all the storage channels, making it easier to reason about. +- If there is a single root storage, blocks like the Disk Drive don't need to maintain a storage per root storage. + They can just expose one storage, making it easier to reason about. Implementation provided in [[1]](#1). ## Consequences - We do remove some compile time safety because we won't have a generic on `Storage`. However: - 1) It's a natural consequence if we want to allow mixed storage channels. + 1) It's a natural consequence if we want to allow mixed root storages. 2) The compile time safety was mostly gone anyway already due to all the unchecked and raw types operations. - We introduce `ResourceKey` to provide some level of safety (not using `Object`). -- We don't need a storage channel type abstraction (there is only a single storage channel) and move some logic +- We don't need a "storage channel" type abstraction (there is only a single root storage) and move some logic to `ResourceKey`. ## References diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/GridSynchronizer.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/GridSynchronizer.java index 78105128f..f3caa76fc 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/GridSynchronizer.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/GridSynchronizer.java @@ -13,7 +13,6 @@ public interface GridSynchronizer { Component getHelpText(); - @SuppressWarnings("EmptyMethod") void synchronizeFromGrid(String text); @Nullable diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridExtractionStrategy.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridExtractionStrategy.java index c94b431c7..63babe6fa 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridExtractionStrategy.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridExtractionStrategy.java @@ -6,6 +6,7 @@ import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.2.6") +@FunctionalInterface public interface GridExtractionStrategy { boolean onExtract(PlatformResourceKey resource, GridExtractMode extractMode, boolean cursor); } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridScrollingStrategy.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridScrollingStrategy.java index 131883ae4..a186e9414 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridScrollingStrategy.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/strategy/GridScrollingStrategy.java @@ -6,6 +6,7 @@ import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.2.6") +@FunctionalInterface public interface GridScrollingStrategy { boolean onScroll(PlatformResourceKey resource, GridScrollMode scrollMode, int slotIndex); } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/channel/FuzzyStorageChannel.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/root/FuzzyRootStorage.java similarity index 61% rename from refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/channel/FuzzyStorageChannel.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/root/FuzzyRootStorage.java index 5b54648d9..9f6f516b3 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/channel/FuzzyStorageChannel.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/root/FuzzyRootStorage.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage.common.api.storage.channel; +package com.refinedmods.refinedstorage.common.api.storage.root; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import java.util.Collection; import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4") -public interface FuzzyStorageChannel extends StorageChannel { +public interface FuzzyRootStorage extends RootStorage { Collection getFuzzy(ResourceKey resource); } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/channel/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/root/package-info.java similarity index 75% rename from refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/channel/package-info.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/root/package-info.java index de20afe59..b275d9134 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/channel/package-info.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/root/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.common.api.storage.channel; +package com.refinedmods.refinedstorage.common.api.storage.root; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceType.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceType.java index 28eb15877..ad0d97054 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceType.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceType.java @@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.api.grid.view.GridResource; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import java.util.Optional; @@ -39,5 +39,5 @@ public interface ResourceType { long getInterfaceExportLimit(); - GridOperations createGridOperations(StorageChannel storageChannel, Actor actor); + GridOperations createGridOperations(RootStorage rootStorage, Actor actor); } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeState.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeState.java index d603d5db1..4a94bc33b 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeState.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeState.java @@ -3,6 +3,7 @@ import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.2.10") +@FunctionalInterface public interface UpgradeState { default boolean has(UpgradeItem upgradeItem) { return getAmount(upgradeItem) > 0; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractItemConstructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractItemConstructorStrategy.java index 6de3c4127..e20a5fe8c 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractItemConstructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractItemConstructorStrategy.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import com.refinedmods.refinedstorage.common.api.constructordestructor.ConstructorStrategy; import com.refinedmods.refinedstorage.common.support.resource.ItemResource; @@ -43,16 +43,16 @@ public final boolean apply( if (!(resource instanceof ItemResource itemResource)) { return false; } - final StorageChannel storageChannel = network.getComponent(StorageNetworkComponent.class); + final RootStorage rootStorage = network.getComponent(StorageNetworkComponent.class); final long amount = getTransferAmount(); - final long extractedAmount = storageChannel.extract(itemResource, amount, Action.SIMULATE, actor); + final long extractedAmount = rootStorage.extract(itemResource, amount, Action.SIMULATE, actor); if (extractedAmount == 0) { return false; } final ItemStack itemStack = itemResource.toItemStack(extractedAmount); final boolean success = apply(itemStack, actor, player); if (success) { - storageChannel.extract(itemResource, extractedAmount, Action.EXECUTE, actor); + rootStorage.extract(itemResource, extractedAmount, Action.EXECUTE, actor); } return success; } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/BlockBreakDestructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/BlockBreakDestructorStrategy.java index d4f4e3b67..5ef08d15e 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/BlockBreakDestructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/BlockBreakDestructorStrategy.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; import com.refinedmods.refinedstorage.api.resource.filter.Filter; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import com.refinedmods.refinedstorage.common.Platform; import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategy; import com.refinedmods.refinedstorage.common.support.resource.ItemResource; @@ -65,16 +65,16 @@ public boolean apply(final Filter filter, player, tool ); - if (!insertDrops(actor, drops, getStorageChannel(networkSupplier), Action.SIMULATE)) { + if (!insertDrops(actor, drops, getRootStorage(networkSupplier), Action.SIMULATE)) { return false; } block.playerWillDestroy(level, pos, blockState, player); level.removeBlock(pos, false); - insertDrops(actor, drops, getStorageChannel(networkSupplier), Action.EXECUTE); + insertDrops(actor, drops, getRootStorage(networkSupplier), Action.EXECUTE); return true; } - private static StorageChannel getStorageChannel(final Supplier network) { + private static RootStorage getRootStorage(final Supplier network) { return network.get().getComponent(StorageNetworkComponent.class); } @@ -106,7 +106,7 @@ private boolean isAllowed( private boolean insertDrops( final Actor actor, final List drops, - final StorageChannel storage, + final RootStorage storage, final Action action ) { for (final ItemStack drop : drops) { diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/FluidBreakDestructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/FluidBreakDestructorStrategy.java index dfda907cc..c72321755 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/FluidBreakDestructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/FluidBreakDestructorStrategy.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; import com.refinedmods.refinedstorage.api.resource.filter.Filter; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import com.refinedmods.refinedstorage.common.Platform; import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategy; import com.refinedmods.refinedstorage.common.support.resource.FluidResource; @@ -59,7 +59,7 @@ private boolean tryInsert(final Actor actor, final LiquidBlock liquidBlock, final FluidResource fluidResource) { final long amount = Platform.INSTANCE.getBucketAmount(); - final long inserted = getStorageChannel(networkSupplier).insert(fluidResource, amount, Action.SIMULATE, actor); + final long inserted = getRootStorage(networkSupplier).insert(fluidResource, amount, Action.SIMULATE, actor); if (inserted != amount) { return false; } @@ -68,11 +68,11 @@ private boolean tryInsert(final Actor actor, sound -> level.playSound(null, pos, sound, SoundSource.BLOCKS, 1.0F, 1.0F) ); level.gameEvent(actingPlayer, GameEvent.FLUID_PICKUP, pos); - getStorageChannel(networkSupplier).insert(fluidResource, amount, Action.EXECUTE, actor); + getRootStorage(networkSupplier).insert(fluidResource, amount, Action.EXECUTE, actor); return true; } - private StorageChannel getStorageChannel(final Supplier networkSupplier) { + private RootStorage getRootStorage(final Supplier networkSupplier) { return networkSupplier.get().getComponent(StorageNetworkComponent.class); } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ItemPickupDestructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ItemPickupDestructorStrategy.java index dc14ed827..438d56dd1 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ItemPickupDestructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ItemPickupDestructorStrategy.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; import com.refinedmods.refinedstorage.api.resource.filter.Filter; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategy; import com.refinedmods.refinedstorage.common.support.resource.ItemResource; @@ -36,17 +36,17 @@ public boolean apply(final Filter filter, if (!level.isLoaded(pos)) { return false; } - final StorageChannel storageChannel = networkSupplier.get().getComponent(StorageNetworkComponent.class); + final RootStorage rootStorage = networkSupplier.get().getComponent(StorageNetworkComponent.class); final List items = level.getEntitiesOfClass(ItemEntity.class, new AABB(pos)); for (final ItemEntity itemEntity : items) { - tryInsert(filter, actor, storageChannel, itemEntity); + tryInsert(filter, actor, rootStorage, itemEntity); } return true; } private void tryInsert(final Filter filter, final Actor actor, - final StorageChannel storageChannel, + final RootStorage rootStorage, final ItemEntity itemEntity) { if (itemEntity.isRemoved()) { return; @@ -57,7 +57,7 @@ private void tryInsert(final Filter filter, return; } final int amount = itemStack.getCount(); - final long inserted = storageChannel.insert(itemResource, amount, Action.EXECUTE, actor); + final long inserted = rootStorage.insert(itemResource, amount, Action.EXECUTE, actor); itemStack.shrink((int) inserted); if (itemStack.isEmpty()) { itemEntity.discard(); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/PlaceFluidConstructorStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/PlaceFluidConstructorStrategy.java index b4e4c3bce..2a5f4523c 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/PlaceFluidConstructorStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/PlaceFluidConstructorStrategy.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import com.refinedmods.refinedstorage.common.Platform; import com.refinedmods.refinedstorage.common.api.constructordestructor.ConstructorStrategy; import com.refinedmods.refinedstorage.common.support.resource.FluidResource; @@ -39,9 +39,9 @@ public boolean apply( if (!(resource instanceof FluidResource fluidResource)) { return false; } - final StorageChannel storageChannel = network.getComponent(StorageNetworkComponent.class); + final RootStorage rootStorage = network.getComponent(StorageNetworkComponent.class); final long bucketAmount = Platform.INSTANCE.getBucketAmount(); - final long extractedAmount = storageChannel.extract( + final long extractedAmount = rootStorage.extract( fluidResource, bucketAmount, Action.SIMULATE, @@ -52,7 +52,7 @@ public boolean apply( } final boolean success = Platform.INSTANCE.placeFluid(level, pos, direction, player, fluidResource); if (success) { - storageChannel.extract(fluidResource, bucketAmount, Action.EXECUTE, actor); + rootStorage.extract(fluidResource, bucketAmount, Action.EXECUTE, actor); } return success; } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/FuzzyDetectorAmountStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/FuzzyDetectorAmountStrategy.java index e3b6e9e0e..f6745d320 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/FuzzyDetectorAmountStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/FuzzyDetectorAmountStrategy.java @@ -5,8 +5,8 @@ import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorAmountStrategy; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.common.api.storage.channel.FuzzyStorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; +import com.refinedmods.refinedstorage.common.api.storage.root.FuzzyRootStorage; class FuzzyDetectorAmountStrategy extends AbstractDetectorAmountStrategy { private final DetectorAmountStrategy fallback; @@ -17,11 +17,11 @@ class FuzzyDetectorAmountStrategy extends AbstractDetectorAmountStrategy { @Override public long getAmount(final Network network, final ResourceKey configuredResource) { - final StorageChannel storageChannel = getStorageChannel(network); - if (!(storageChannel instanceof FuzzyStorageChannel fuzzyStorageChannel)) { + final RootStorage rootStorage = getRootStorage(network); + if (!(rootStorage instanceof FuzzyRootStorage fuzzyRootStorage)) { return fallback.getAmount(network, configuredResource); } - return fuzzyStorageChannel.getFuzzy(configuredResource) + return fuzzyRootStorage.getFuzzy(configuredResource) .stream() .mapToLong(ResourceAmount::getAmount) .sum(); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/FuzzyExporterTransferStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/FuzzyExporterTransferStrategy.java index 2fe587367..0c9d5db4c 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/FuzzyExporterTransferStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/FuzzyExporterTransferStrategy.java @@ -4,8 +4,8 @@ import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.common.api.storage.channel.FuzzyStorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; +import com.refinedmods.refinedstorage.common.api.storage.root.FuzzyRootStorage; import java.util.Collection; import java.util.stream.Collectors; @@ -16,14 +16,14 @@ public FuzzyExporterTransferStrategy(final InsertableStorage destination, final } @Override - protected Collection expand(final ResourceKey resource, final StorageChannel storageChannel) { - if (storageChannel instanceof FuzzyStorageChannel fuzzyStorageChannel) { - return fuzzyStorageChannel + protected Collection expand(final ResourceKey resource, final RootStorage rootStorage) { + if (rootStorage instanceof FuzzyRootStorage fuzzyRootStorage) { + return fuzzyRootStorage .getFuzzy(resource) .stream() .map(ResourceAmount::getResource) .collect(Collectors.toSet()); } - return super.expand(resource, storageChannel); + return super.expand(resource, rootStorage); } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridBlockEntity.java index d78f12745..b0e04815d 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridBlockEntity.java @@ -9,7 +9,7 @@ import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.Storage; import com.refinedmods.refinedstorage.api.storage.TrackedResourceAmount; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import com.refinedmods.refinedstorage.common.api.PlatformApi; import com.refinedmods.refinedstorage.common.api.grid.Grid; import com.refinedmods.refinedstorage.common.api.security.PlatformSecurityNetworkComponent; @@ -73,9 +73,9 @@ public List getResources(final Class act @Override public GridOperations createOperations(final ResourceType resourceType, final ServerPlayer player) { final Network network = requireNonNull(mainNode.getNetwork()); - final StorageChannel storageChannel = network.getComponent(StorageNetworkComponent.class); + final RootStorage rootStorage = network.getComponent(StorageNetworkComponent.class); final PlatformSecurityNetworkComponent security = network.getComponent(PlatformSecurityNetworkComponent.class); - final GridOperations operations = resourceType.createGridOperations(storageChannel, new PlayerActor(player)); + final GridOperations operations = resourceType.createGridOperations(rootStorage, new PlayerActor(player)); return new SecuredGridOperations(player, security, operations); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridContainerMenu.java index e2a4300a8..612dc3bd0 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridContainerMenu.java @@ -109,7 +109,7 @@ protected AbstractGridContainerMenu( this.view = viewBuilder.build(); this.view.setSortingDirection(Platform.INSTANCE.getConfig().getGrid().getSortingDirection()); this.view.setSortingType(Platform.INSTANCE.getConfig().getGrid().getSortingType()); - this.view.setFilterAndSort(filterStorageChannel()); + this.view.setFilterAndSort(filterResourceType()); this.synchronizer = loadSynchronizer(); this.resourceTypeFilter = loadResourceType(); @@ -137,16 +137,13 @@ protected AbstractGridContainerMenu( initStrategies((ServerPlayer) playerInventory.player); } - private Predicate filterStorageChannel() { - return gridResource -> Platform.INSTANCE - .getConfig() - .getGrid() - .getResourceType() - .flatMap(resourceTypeId -> PlatformApi.INSTANCE + private Predicate filterResourceType() { + return gridResource -> Platform.INSTANCE.getConfig().getGrid().getResourceType().flatMap(resourceTypeId -> + PlatformApi.INSTANCE .getResourceTypeRegistry() .get(resourceTypeId) .map(type -> type.isGridResourceBelonging(gridResource)) - ).orElse(true); + ).orElse(true); } private static GridViewBuilder createViewBuilder() { @@ -199,7 +196,7 @@ private void registerViewUpdatingListener(final GridSearchBox theSearchBox) { private boolean onSearchTextChanged(final String text) { try { - view.setFilterAndSort(QUERY_PARSER.parse(text).and(filterStorageChannel())); + view.setFilterAndSort(QUERY_PARSER.parse(text).and(filterResourceType())); return true; } catch (GridQueryParserException e) { view.setFilterAndSort(resource -> false); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridBlockEntity.java index 46f644f4a..7b6957c86 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridBlockEntity.java @@ -3,7 +3,7 @@ import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import com.refinedmods.refinedstorage.common.Platform; import com.refinedmods.refinedstorage.common.api.storage.PlayerActor; import com.refinedmods.refinedstorage.common.content.BlockEntities; @@ -147,18 +147,18 @@ Optional getNetwork() { return Optional.ofNullable(mainNode.getNetwork()); } - Optional getStorageChannel() { + Optional getRootStorage() { return getNetwork().map(network -> network.getComponent(StorageNetworkComponent.class)); } ItemStack insert(final ItemStack stack, final Player player) { - return getStorageChannel().map(storageChannel -> doInsert(stack, player, storageChannel)).orElse(stack); + return getRootStorage().map(rootStorage -> doInsert(stack, player, rootStorage)).orElse(stack); } private ItemStack doInsert(final ItemStack stack, final Player player, - final StorageChannel storageChannel) { - final long inserted = storageChannel.insert( + final RootStorage rootStorage) { + final long inserted = rootStorage.insert( ItemResource.ofItemStack(stack), stack.getCount(), Action.EXECUTE, @@ -172,7 +172,7 @@ private ItemStack doInsert(final ItemStack stack, } long extract(final ItemResource resource, final Player player) { - return getStorageChannel().map(storageChannel -> storageChannel.extract( + return getRootStorage().map(rootStorage -> rootStorage.extract( resource, 1, Action.EXECUTE, diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/SnapshotCraftingGridRefillContext.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/SnapshotCraftingGridRefillContext.java index fe846028b..833bfa89c 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/SnapshotCraftingGridRefillContext.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/SnapshotCraftingGridRefillContext.java @@ -3,7 +3,7 @@ import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.resource.list.ResourceList; import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import com.refinedmods.refinedstorage.common.api.storage.PlayerActor; import com.refinedmods.refinedstorage.common.support.resource.ItemResource; @@ -27,29 +27,29 @@ class SnapshotCraftingGridRefillContext implements CraftingGridRefillContext { } private void addAvailableItems(final CraftingMatrix craftingMatrix) { - blockEntity.getStorageChannel().ifPresent(storageChannel -> { + blockEntity.getRootStorage().ifPresent(rootStorage -> { for (int i = 0; i < craftingMatrix.getContainerSize(); ++i) { - addAvailableItem(craftingMatrix, storageChannel, i); + addAvailableItem(craftingMatrix, rootStorage, i); } }); } private void addAvailableItem(final CraftingMatrix craftingMatrix, - final StorageChannel storageChannel, + final RootStorage rootStorage, final int craftingMatrixSlotIndex) { final ItemStack craftingMatrixStack = craftingMatrix.getItem(craftingMatrixSlotIndex); if (craftingMatrixStack.isEmpty()) { return; } - addAvailableItem(storageChannel, craftingMatrixStack); + addAvailableItem(rootStorage, craftingMatrixStack); } - private void addAvailableItem(final StorageChannel storageChannel, + private void addAvailableItem(final RootStorage rootStorage, final ItemStack craftingMatrixStack) { final ItemResource craftingMatrixResource = ItemResource.ofItemStack(craftingMatrixStack); // a single resource can occur multiple times in a recipe, only add it once if (available.get(craftingMatrixResource).isEmpty()) { - storageChannel.get(craftingMatrixResource).ifPresent(available::add); + rootStorage.get(craftingMatrixResource).ifPresent(available::add); } } @@ -67,10 +67,10 @@ public boolean extract(final ItemResource resource, final Player player) { @Override public void close() { - blockEntity.getStorageChannel().ifPresent(this::extractUsedItems); + blockEntity.getRootStorage().ifPresent(this::extractUsedItems); } - private void extractUsedItems(final StorageChannel storageChannel) { - used.getAll().forEach(u -> storageChannel.extract(u.getResource(), u.getAmount(), Action.EXECUTE, playerActor)); + private void extractUsedItems(final RootStorage rootStorage) { + used.getAll().forEach(u -> rootStorage.extract(u.getResource(), u.getAmount(), Action.EXECUTE, playerActor)); } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGrid.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGrid.java index 82f6de4f9..e8f159171 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGrid.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGrid.java @@ -79,18 +79,18 @@ public List getResources(final Class act @Override public GridOperations createOperations(final ResourceType resourceType, final ServerPlayer player) { return getStorage() - .flatMap(storageChannel -> - getSecurity().map(security -> createGridOperations(resourceType, player, storageChannel, security))) + .flatMap(rootStorage -> + getSecurity().map(security -> createGridOperations(resourceType, player, rootStorage, security))) .map(gridOperations -> (GridOperations) new WirelessGridOperations(gridOperations, session, watchers)) .orElseGet(NoopGridOperations::new); } private GridOperations createGridOperations(final ResourceType resourceType, final ServerPlayer player, - final StorageNetworkComponent storageChannel, + final StorageNetworkComponent rootStorage, final PlatformSecurityNetworkComponent securityNetworkComponent) { final PlayerActor playerActor = new PlayerActor(player); - final GridOperations operations = resourceType.createGridOperations(storageChannel, playerActor); + final GridOperations operations = resourceType.createGridOperations(rootStorage, playerActor); return new SecuredGridOperations(player, securityNetworkComponent, operations); } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/ExportedResourcesContainer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/ExportedResourcesContainer.java index d2f7e0756..f9876f3a1 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/ExportedResourcesContainer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/ExportedResourcesContainer.java @@ -3,9 +3,9 @@ import com.refinedmods.refinedstorage.api.network.impl.node.iface.InterfaceExportState; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import com.refinedmods.refinedstorage.common.api.PlatformApi; -import com.refinedmods.refinedstorage.common.api.storage.channel.FuzzyStorageChannel; +import com.refinedmods.refinedstorage.common.api.storage.root.FuzzyRootStorage; import com.refinedmods.refinedstorage.common.api.support.resource.FuzzyModeNormalizer; import com.refinedmods.refinedstorage.common.support.FilterWithFuzzyMode; import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; @@ -34,15 +34,15 @@ public int getSlots() { } @Override - public Collection expandExportCandidates(final StorageChannel storageChannel, + public Collection expandExportCandidates(final RootStorage rootStorage, final ResourceKey resource) { if (!filter.isFuzzyMode()) { return Collections.singletonList(resource); } - if (!(storageChannel instanceof FuzzyStorageChannel fuzzyStorageChannel)) { + if (!(rootStorage instanceof FuzzyRootStorage fuzzyRootStorage)) { return Collections.singletonList(resource); } - return fuzzyStorageChannel + return fuzzyRootStorage .getFuzzy(resource) .stream() .map(ResourceAmount::getResource) diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGrid.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGrid.java index 483d8542b..22e2c6dde 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGrid.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGrid.java @@ -13,7 +13,7 @@ import com.refinedmods.refinedstorage.api.storage.Storage; import com.refinedmods.refinedstorage.api.storage.StorageState; import com.refinedmods.refinedstorage.api.storage.TrackedResourceAmount; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import com.refinedmods.refinedstorage.common.Platform; import com.refinedmods.refinedstorage.common.api.grid.Grid; import com.refinedmods.refinedstorage.common.api.storage.PlayerActor; @@ -44,7 +44,7 @@ class PortableGrid implements Grid { void updateStorage() { if (storage != null) { - watchers.detachAll(storage.getStorageChannel()); + watchers.detachAll(storage.getRootStorage()); } this.storage = diskInventory.resolve(0) @@ -52,7 +52,7 @@ void updateStorage() { .map(PortableGridStorage::new) .orElse(null); - watchers.attachAll(getStorageChannel()); + watchers.attachAll(getRootStorage()); } void activeChanged(final boolean active) { @@ -72,17 +72,17 @@ StorageState getStorageState() { @Override public void addWatcher(final GridWatcher watcher, final Class actorType) { energyStorage.extract(Platform.INSTANCE.getConfig().getPortableGrid().getOpenEnergyUsage(), Action.EXECUTE); - watchers.addWatcher(watcher, actorType, getStorageChannel()); + watchers.addWatcher(watcher, actorType, getRootStorage()); } @Override public void removeWatcher(final GridWatcher watcher) { - watchers.removeWatcher(watcher, getStorageChannel()); + watchers.removeWatcher(watcher, getRootStorage()); } @Nullable - private StorageChannel getStorageChannel() { - return storage != null ? storage.getStorageChannel() : null; + private RootStorage getRootStorage() { + return storage != null ? storage.getRootStorage() : null; } @Override @@ -90,7 +90,7 @@ public Storage getItemStorage() { if (storage == null) { return new NoopStorage(); } - return storage.getStorageChannel(); + return storage.getRootStorage(); } @Override @@ -103,10 +103,10 @@ public List getResources(final Class act if (storage == null) { return Collections.emptyList(); } - final StorageChannel storageChannel = storage.getStorageChannel(); - return storageChannel.getAll().stream().map(resource -> new TrackedResourceAmount( + final RootStorage rootStorage = storage.getRootStorage(); + return rootStorage.getAll().stream().map(resource -> new TrackedResourceAmount( resource, - storageChannel.findTrackedResourceByActorType(resource.getResource(), actorType).orElse(null) + rootStorage.findTrackedResourceByActorType(resource.getResource(), actorType).orElse(null) )).toList(); } @@ -115,8 +115,8 @@ public GridOperations createOperations(final ResourceType resourceType, final Se if (storage == null) { return new NoopGridOperations(); } - final StorageChannel storageChannel = this.storage.getStorageChannel(); - final GridOperations operations = resourceType.createGridOperations(storageChannel, new PlayerActor(player)); + final RootStorage rootStorage = this.storage.getRootStorage(); + final GridOperations operations = resourceType.createGridOperations(rootStorage, new PlayerActor(player)); return new PortableGridOperations(operations, energyStorage); } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridStorage.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridStorage.java index 4ad9d9abb..c586579c0 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridStorage.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridStorage.java @@ -2,24 +2,24 @@ import com.refinedmods.refinedstorage.api.storage.StateTrackedStorage; import com.refinedmods.refinedstorage.api.storage.StorageState; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannelImpl; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; +import com.refinedmods.refinedstorage.api.storage.root.RootStorageImpl; class PortableGridStorage { - private final StorageChannel storageChannel; + private final RootStorage rootStorage; private final StateTrackedStorage diskStorage; PortableGridStorage(final StateTrackedStorage diskStorage) { - this.storageChannel = new StorageChannelImpl(); + this.rootStorage = new RootStorageImpl(); this.diskStorage = diskStorage; - this.storageChannel.addSource(diskStorage); + this.rootStorage.addSource(diskStorage); } StorageState getState() { return diskStorage.getState(); } - StorageChannel getStorageChannel() { - return storageChannel; + RootStorage getRootStorage() { + return rootStorage; } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/FluidStorageMonitorExtractionStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/FluidStorageMonitorExtractionStrategy.java index 7533ca209..e59b88a57 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/FluidStorageMonitorExtractionStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/FluidStorageMonitorExtractionStrategy.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.TransferHelper; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import com.refinedmods.refinedstorage.common.Platform; import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorExtractionStrategy; import com.refinedmods.refinedstorage.common.storage.BucketPlayerInventoryInsertableStorage; @@ -28,7 +28,7 @@ public boolean extract(final ResourceKey resource, network.getComponent(StorageNetworkComponent.class), true ); - final StorageChannel source = network.getComponent(StorageNetworkComponent.class); + final RootStorage source = network.getComponent(StorageNetworkComponent.class); return TransferHelper.transfer( fluidResource, Platform.INSTANCE.getBucketAmount(), diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java index 41e5e3368..6e6ee16a9 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import com.refinedmods.refinedstorage.common.Platform; import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorInsertionStrategy; import com.refinedmods.refinedstorage.common.api.support.resource.FluidOperationResult; @@ -27,21 +27,21 @@ public Optional insert( if (!(configuredResource instanceof FluidResource configuredFluidResource)) { return Optional.empty(); } - final StorageChannel fluidStorageChannel = network.getComponent(StorageNetworkComponent.class); + final RootStorage fluidRootStorage = network.getComponent(StorageNetworkComponent.class); return Platform.INSTANCE.drainContainer(stack) - .map(extracted -> tryInsert(actor, configuredFluidResource, extracted, fluidStorageChannel)) - .map(extracted -> doInsert(actor, extracted, fluidStorageChannel)); + .map(extracted -> tryInsert(actor, configuredFluidResource, extracted, fluidRootStorage)) + .map(extracted -> doInsert(actor, extracted, fluidRootStorage)); } @Nullable private FluidOperationResult tryInsert(final Actor actor, final FluidResource configuredResource, final FluidOperationResult result, - final StorageChannel storageChannel) { + final RootStorage rootStorage) { if (!result.fluid().equals(configuredResource)) { return null; } - final long insertedSimulated = storageChannel.insert( + final long insertedSimulated = rootStorage.insert( result.fluid(), result.amount(), Action.SIMULATE, @@ -53,8 +53,8 @@ private FluidOperationResult tryInsert(final Actor actor, private ItemStack doInsert(final Actor actor, final FluidOperationResult result, - final StorageChannel storageChannel) { - storageChannel.insert( + final RootStorage rootStorage) { + rootStorage.insert( result.fluid(), result.amount(), Action.EXECUTE, diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlockEntity.java index 3d31cb6f2..adb894b73 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlockEntity.java @@ -5,11 +5,11 @@ import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import com.refinedmods.refinedstorage.common.Platform; import com.refinedmods.refinedstorage.common.api.PlatformApi; import com.refinedmods.refinedstorage.common.api.storage.PlayerActor; -import com.refinedmods.refinedstorage.common.api.storage.channel.FuzzyStorageChannel; +import com.refinedmods.refinedstorage.common.api.storage.root.FuzzyRootStorage; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; import com.refinedmods.refinedstorage.common.content.BlockEntities; import com.refinedmods.refinedstorage.common.content.ContentNames; @@ -100,11 +100,11 @@ private long getAmount() { } private long getAmount(final Network network, final ResourceKey configuredResource) { - final StorageChannel storageChannel = network.getComponent(StorageNetworkComponent.class); - if (!filter.isFuzzyMode() || !(storageChannel instanceof FuzzyStorageChannel fuzzyStorageChannel)) { - return storageChannel.get(configuredResource).map(ResourceAmount::getAmount).orElse(0L); + final RootStorage rootStorage = network.getComponent(StorageNetworkComponent.class); + if (!filter.isFuzzyMode() || !(rootStorage instanceof FuzzyRootStorage fuzzyRootStorage)) { + return rootStorage.get(configuredResource).map(ResourceAmount::getAmount).orElse(0L); } - return fuzzyStorageChannel.getFuzzy(configuredResource).stream().mapToLong(ResourceAmount::getAmount).sum(); + return fuzzyRootStorage.getFuzzy(configuredResource).stream().mapToLong(ResourceAmount::getAmount).sum(); } public void extract(final Player player) { diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/component/PlatformStorageNetworkComponent.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/component/PlatformStorageNetworkComponent.java index 98195ff66..0302c6dad 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/component/PlatformStorageNetworkComponent.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/component/PlatformStorageNetworkComponent.java @@ -4,13 +4,13 @@ import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage.common.api.storage.channel.FuzzyStorageChannel; +import com.refinedmods.refinedstorage.common.api.storage.root.FuzzyRootStorage; import com.refinedmods.refinedstorage.common.api.support.resource.list.FuzzyResourceList; import com.refinedmods.refinedstorage.common.support.resource.list.FuzzyResourceListImpl; import java.util.Collection; -public class PlatformStorageNetworkComponent extends StorageNetworkComponentImpl implements FuzzyStorageChannel { +public class PlatformStorageNetworkComponent extends StorageNetworkComponentImpl implements FuzzyRootStorage { private final FuzzyResourceList fuzzyResourceList; public PlatformStorageNetworkComponent() { diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceType.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceType.java index f8d6d30e7..98cddc50f 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceType.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceType.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.grid.view.GridResource; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import com.refinedmods.refinedstorage.common.Platform; import com.refinedmods.refinedstorage.common.api.support.resource.AbstractResourceType; import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; @@ -57,9 +57,9 @@ public long getInterfaceExportLimit() { } @Override - public GridOperations createGridOperations(final StorageChannel storageChannel, final Actor actor) { + public GridOperations createGridOperations(final RootStorage rootStorage, final Actor actor) { return new GridOperationsImpl( - storageChannel, + rootStorage, actor, fluidResource -> Long.MAX_VALUE, Platform.INSTANCE.getBucketAmount() diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ItemResourceType.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ItemResourceType.java index e79bcc7fe..0588b9a0b 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ItemResourceType.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ItemResourceType.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.grid.view.GridResource; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import com.refinedmods.refinedstorage.common.Platform; import com.refinedmods.refinedstorage.common.api.support.resource.AbstractResourceType; import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; @@ -57,9 +57,9 @@ public long getInterfaceExportLimit() { } @Override - public GridOperations createGridOperations(final StorageChannel storageChannel, final Actor actor) { + public GridOperations createGridOperations(final RootStorage rootStorage, final Actor actor) { return new GridOperationsImpl( - storageChannel, + rootStorage, actor, resource -> resource instanceof ItemResource itemResource ? itemResource.item().getDefaultMaxStackSize() diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/FluidGridExtractionStrategy.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/FluidGridExtractionStrategy.java index 2665dbb22..fab9c3b53 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/FluidGridExtractionStrategy.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/grid/strategy/FluidGridExtractionStrategy.java @@ -49,10 +49,10 @@ public boolean onExtract(final PlatformResourceKey resource, final boolean cursor) { if (resource instanceof FluidResource fluidResource) { final boolean bucketInInventory = hasBucketInInventory(); - final boolean bucketInStorageChannel = hasBucketInStorage(); + final boolean bucketInStorage = hasBucketInStorage(); if (bucketInInventory) { extractWithBucketInInventory(fluidResource, extractMode, cursor); - } else if (bucketInStorageChannel) { + } else if (bucketInStorage) { extractWithBucketInStorage(fluidResource, extractMode, cursor); } return true; diff --git a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/GridOperationsImpl.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/GridOperationsImpl.java index 5893dd500..d4b1d3476 100644 --- a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/GridOperationsImpl.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/GridOperationsImpl.java @@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; import com.refinedmods.refinedstorage.api.storage.TransferHelper; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import java.util.function.ToLongFunction; @@ -14,23 +14,23 @@ @API(status = API.Status.STABLE, since = "2.0.0-milestone.1.2") public class GridOperationsImpl implements GridOperations { - private final StorageChannel storageChannel; + private final RootStorage rootStorage; private final Actor actor; private final ToLongFunction maxAmountProvider; private final long singleAmount; /** - * @param storageChannel the storage channel to act on + * @param rootStorage the storage to act on * @param actor the actor performing the grid operations * @param maxAmountProvider provider for the maximum amount of a given resource * @param singleAmount amount that needs to be extracted when using * {@link GridInsertMode#SINGLE_RESOURCE} or {@link GridExtractMode#SINGLE_RESOURCE} */ - public GridOperationsImpl(final StorageChannel storageChannel, + public GridOperationsImpl(final RootStorage rootStorage, final Actor actor, final ToLongFunction maxAmountProvider, final long singleAmount) { - this.storageChannel = storageChannel; + this.rootStorage = rootStorage; this.actor = actor; this.maxAmountProvider = maxAmountProvider; this.singleAmount = singleAmount; @@ -44,7 +44,7 @@ public boolean extract(final ResourceKey resource, if (amount == 0) { return false; } - return TransferHelper.transfer(resource, amount, actor, storageChannel, destination, storageChannel) > 0; + return TransferHelper.transfer(resource, amount, actor, rootStorage, destination, rootStorage) > 0; } private long getExtractableAmount(final ResourceKey resource, final GridExtractMode extractMode) { @@ -53,7 +53,7 @@ private long getExtractableAmount(final ResourceKey resource, final GridExtractM } private long getExtractableAmount(final ResourceKey resource) { - final long totalSize = storageChannel.get(resource).map(ResourceAmount::getAmount).orElse(0L); + final long totalSize = rootStorage.get(resource).map(ResourceAmount::getAmount).orElse(0L); final long maxAmount = maxAmountProvider.applyAsLong(resource); return Math.min(totalSize, maxAmount); } @@ -75,6 +75,6 @@ public boolean insert(final ResourceKey resource, case ENTIRE_RESOURCE -> maxAmountProvider.applyAsLong(resource); case SINGLE_RESOURCE -> singleAmount; }; - return TransferHelper.transfer(resource, amount, actor, source, storageChannel, null) > 0; + return TransferHelper.transfer(resource, amount, actor, source, rootStorage, null) > 0; } } diff --git a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManager.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManager.java index 3287bbc6b..81ce00e10 100644 --- a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManager.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManager.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.api.grid.watcher; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import javax.annotation.Nullable; @@ -9,19 +9,19 @@ /** * This manager helps with attaching and detaching listeners to - * {@link com.refinedmods.refinedstorage.api.storage.channel.StorageChannel}s. + * {@link RootStorage}s. */ @API(status = API.Status.STABLE, since = "2.0.0-milestone.3.3") public interface GridWatcherManager { void addWatcher(GridWatcher watcher, Class actorType, - @Nullable StorageChannel storageChannel); + @Nullable RootStorage rootStorage); - void attachAll(@Nullable StorageChannel storageChannel); + void attachAll(@Nullable RootStorage rootStorage); - void removeWatcher(GridWatcher watcher, @Nullable StorageChannel storageChannel); + void removeWatcher(GridWatcher watcher, @Nullable RootStorage rootStorage); - void detachAll(StorageChannel storageChannel); + void detachAll(RootStorage rootStorage); void activeChanged(boolean active); } diff --git a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManagerImpl.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManagerImpl.java index 1b5f8b937..c363bc680 100644 --- a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManagerImpl.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManagerImpl.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.api.grid.watcher; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import java.util.HashMap; import java.util.Map; @@ -21,21 +21,21 @@ public class GridWatcherManagerImpl implements GridWatcherManager { public void addWatcher( final GridWatcher watcher, final Class actorType, - @Nullable final StorageChannel storageChannel + @Nullable final RootStorage rootStorage ) { if (watchers.containsKey(watcher)) { throw new IllegalArgumentException("Watcher is already registered"); } final GridWatcherRegistration registration = new GridWatcherRegistration(watcher, actorType); - if (storageChannel != null) { - attach(registration, storageChannel, false); + if (rootStorage != null) { + attach(registration, rootStorage, false); } watchers.put(watcher, registration); LOGGER.debug("Added watcher {}, new count is {}", watcher, watchers.size()); } @Override - public void attachAll(@Nullable final StorageChannel storageChannel) { + public void attachAll(@Nullable final RootStorage rootStorage) { // If we get here we are affected by a network split or network merge. // At this point, all the storages that are affected by the split or merge have not yet been processed // as the grid has the highest priority. @@ -43,46 +43,46 @@ public void attachAll(@Nullable final StorageChannel storageChannel) { // Invalidate all watcher data, the resources that were synced earlier are no longer valid because we have // a brand-new network. watcher.invalidate(); - if (storageChannel != null) { + if (rootStorage != null) { // Re-attach the watcher to the new network, and send all the resources from the new network. // Resources from the old network are not part of the new network yet, as mentioned above, // but those will be synced when the storages are re-added. - attach(registration, storageChannel, true); + attach(registration, rootStorage, true); } }); } private void attach( final GridWatcherRegistration registration, - final StorageChannel storageChannel, + final RootStorage rootStorage, final boolean replay ) { - LOGGER.debug("Attaching {} to {}", registration, storageChannel); - registration.attach(storageChannel, replay); + LOGGER.debug("Attaching {} to {}", registration, rootStorage); + registration.attach(rootStorage, replay); } @Override - public void removeWatcher(final GridWatcher watcher, @Nullable final StorageChannel storageChannel) { + public void removeWatcher(final GridWatcher watcher, @Nullable final RootStorage rootStorage) { final GridWatcherRegistration registration = watchers.get(watcher); if (registration == null) { throw new IllegalArgumentException("Watcher is not registered"); } - if (storageChannel != null) { - detach(registration, storageChannel); + if (rootStorage != null) { + detach(registration, rootStorage); } watchers.remove(watcher); LOGGER.debug("Removed watcher {}, remaining {}", watcher, watchers.size()); } @Override - public void detachAll(final StorageChannel storageChannel) { + public void detachAll(final RootStorage rootStorage) { LOGGER.debug("Detaching {} watchers", watchers.size()); - watchers.values().forEach(watcher -> detach(watcher, storageChannel)); + watchers.values().forEach(watcher -> detach(watcher, rootStorage)); } - private void detach(final GridWatcherRegistration registration, final StorageChannel storageChannel) { - LOGGER.debug("Detaching {} from {}", registration, storageChannel); - registration.detach(storageChannel); + private void detach(final GridWatcherRegistration registration, final RootStorage rootStorage) { + LOGGER.debug("Detaching {} from {}", registration, rootStorage); + registration.detach(rootStorage); } @Override diff --git a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherRegistration.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherRegistration.java index 7fc89b970..5dae822b6 100644 --- a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherRegistration.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherRegistration.java @@ -2,7 +2,7 @@ import com.refinedmods.refinedstorage.api.resource.list.listenable.ResourceListListener; import com.refinedmods.refinedstorage.api.storage.Actor; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import javax.annotation.Nullable; @@ -17,21 +17,21 @@ class GridWatcherRegistration { this.actorType = actorType; } - void attach(final StorageChannel storageChannel, final boolean replay) { + void attach(final RootStorage rootStorage, final boolean replay) { this.listener = change -> watcher.onChanged( change.resourceAmount().getResource(), change.change(), - storageChannel.findTrackedResourceByActorType( + rootStorage.findTrackedResourceByActorType( change.resourceAmount().getResource(), actorType ).orElse(null) ); - storageChannel.addListener(listener); + rootStorage.addListener(listener); if (replay) { - storageChannel.getAll().forEach(resourceAmount -> watcher.onChanged( + rootStorage.getAll().forEach(resourceAmount -> watcher.onChanged( resourceAmount.getResource(), resourceAmount.getAmount(), - storageChannel.findTrackedResourceByActorType( + rootStorage.findTrackedResourceByActorType( resourceAmount.getResource(), actorType ).orElse(null) @@ -39,11 +39,11 @@ void attach(final StorageChannel storageChannel, final boolean replay) { } } - void detach(final StorageChannel storageChannel) { + void detach(final RootStorage rootStorage) { if (listener == null) { return; } - storageChannel.removeListener(listener); + rootStorage.removeListener(listener); listener = null; } } diff --git a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/GridOperationsImplTest.java b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/GridOperationsImplTest.java index 5bb3bb0fc..4f34d02ce 100644 --- a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/GridOperationsImplTest.java +++ b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/GridOperationsImplTest.java @@ -9,8 +9,8 @@ import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.EmptyActor; import com.refinedmods.refinedstorage.api.storage.Storage; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannelImpl; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; +import com.refinedmods.refinedstorage.api.storage.root.RootStorageImpl; import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageImpl; @@ -28,13 +28,13 @@ class GridOperationsImplTest { private static final long MAX_COUNT = 15; - private StorageChannel storageChannel; + private RootStorage rootStorage; private GridOperationsImpl sut; @BeforeEach void setUp() { - storageChannel = new StorageChannelImpl(); - sut = new GridOperationsImpl(storageChannel, GridActor.INSTANCE, r -> MAX_COUNT, 1); + rootStorage = new RootStorageImpl(); + sut = new GridOperationsImpl(rootStorage, GridActor.INSTANCE, r -> MAX_COUNT, 1); } @Nested @@ -48,7 +48,7 @@ void shouldInsertIntoDestination(final GridInsertMode insertMode) { source.insert(A, MAX_COUNT * 3, Action.EXECUTE, EmptyActor.INSTANCE); final Storage destination = new TrackedStorageImpl(new LimitedStorageImpl(100), () -> 0L); - storageChannel.addSource(destination); + rootStorage.addSource(destination); // Act final boolean success = sut.insert(A, insertMode, source); @@ -61,13 +61,13 @@ void shouldInsertIntoDestination(final GridInsertMode insertMode) { case SINGLE_RESOURCE -> 1; }; - assertThat(storageChannel.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( + assertThat(rootStorage.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( new ResourceAmount(A, expectedAmount) ); assertThat(source.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( new ResourceAmount(A, (MAX_COUNT * 3) - expectedAmount) ); - assertThat(storageChannel.findTrackedResourceByActorType(A, GridActor.class)) + assertThat(rootStorage.findTrackedResourceByActorType(A, GridActor.class)) .get() .usingRecursiveComparison() .isEqualTo(new TrackedResource(GridActor.NAME, 0)); @@ -80,16 +80,16 @@ void shouldNotInsertIntoDestinationWhenResourceIsNotPresentInSource(final GridIn final Storage source = new LimitedStorageImpl(100); final Storage destination = new TrackedStorageImpl(new LimitedStorageImpl(100), () -> 0L); - storageChannel.addSource(destination); + rootStorage.addSource(destination); // Act final boolean success = sut.insert(A, insertMode, source); // Assert assertThat(success).isFalse(); - assertThat(storageChannel.getAll()).isEmpty(); + assertThat(rootStorage.getAll()).isEmpty(); assertThat(source.getAll()).isEmpty(); - assertThat(storageChannel.findTrackedResourceByActorType(A, GridActor.class)).isEmpty(); + assertThat(rootStorage.findTrackedResourceByActorType(A, GridActor.class)).isEmpty(); } @ParameterizedTest @@ -100,21 +100,21 @@ void shouldNotInsertIntoDestinationWhenNoSpaceIsPresentInDestination(final GridI source.insert(A, 100, Action.EXECUTE, EmptyActor.INSTANCE); final Storage destination = new TrackedStorageImpl(new LimitedStorageImpl(100), () -> 0L); - storageChannel.addSource(destination); - storageChannel.insert(A, 100, Action.EXECUTE, EmptyActor.INSTANCE); + rootStorage.addSource(destination); + rootStorage.insert(A, 100, Action.EXECUTE, EmptyActor.INSTANCE); // Act final boolean success = sut.insert(A, insertMode, source); // Assert assertThat(success).isFalse(); - assertThat(storageChannel.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( + assertThat(rootStorage.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( new ResourceAmount(A, 100) ); assertThat(source.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( new ResourceAmount(A, 100) ); - assertThat(storageChannel.findTrackedResourceByActorType(A, GridActor.class)).isEmpty(); + assertThat(rootStorage.findTrackedResourceByActorType(A, GridActor.class)).isEmpty(); } } @@ -128,21 +128,21 @@ void shouldInsertIntoDestinationWithRemainder() { source.insert(A, MAX_COUNT, Action.EXECUTE, EmptyActor.INSTANCE); final Storage destination = new TrackedStorageImpl(new LimitedStorageImpl(100), () -> 0L); - storageChannel.addSource(destination); - storageChannel.insert(A, 100 - MAX_COUNT + 1, Action.EXECUTE, EmptyActor.INSTANCE); + rootStorage.addSource(destination); + rootStorage.insert(A, 100 - MAX_COUNT + 1, Action.EXECUTE, EmptyActor.INSTANCE); // Act final boolean success = sut.insert(A, GridInsertMode.ENTIRE_RESOURCE, source); // Assert assertThat(success).isTrue(); - assertThat(storageChannel.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( + assertThat(rootStorage.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( new ResourceAmount(A, 100) ); assertThat(source.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( new ResourceAmount(A, 1) ); - assertThat(storageChannel.findTrackedResourceByActorType(A, GridActor.class)) + assertThat(rootStorage.findTrackedResourceByActorType(A, GridActor.class)) .get() .usingRecursiveComparison() .isEqualTo(new TrackedResource(GridActor.NAME, 0)); @@ -172,21 +172,21 @@ public long extract(final ResourceKey resource, source.insert(A, MAX_COUNT, Action.EXECUTE, EmptyActor.INSTANCE); final Storage destination = new TrackedStorageImpl(new LimitedStorageImpl(100), () -> 0L); - storageChannel.addSource(destination); - storageChannel.insert(A, 100 - MAX_COUNT + 1, Action.EXECUTE, EmptyActor.INSTANCE); + rootStorage.addSource(destination); + rootStorage.insert(A, 100 - MAX_COUNT + 1, Action.EXECUTE, EmptyActor.INSTANCE); // Act final boolean success = sut.insert(A, GridInsertMode.ENTIRE_RESOURCE, source); // Assert assertThat(success).isFalse(); - assertThat(storageChannel.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( + assertThat(rootStorage.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( new ResourceAmount(A, 100 - MAX_COUNT + 1) ); assertThat(source.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( new ResourceAmount(A, MAX_COUNT) ); - assertThat(storageChannel.findTrackedResourceByActorType(A, GridActor.class)).isEmpty(); + assertThat(rootStorage.findTrackedResourceByActorType(A, GridActor.class)).isEmpty(); } } @@ -200,8 +200,8 @@ void shouldExtractFromSourceToDestination(final GridExtractMode extractMode) { final Storage destination = new LimitedStorageImpl(100); final Storage source = new TrackedStorageImpl(new LimitedStorageImpl(100), () -> 0L); - storageChannel.addSource(source); - storageChannel.insert(A, 100, Action.EXECUTE, EmptyActor.INSTANCE); + rootStorage.addSource(source); + rootStorage.insert(A, 100, Action.EXECUTE, EmptyActor.INSTANCE); // Act final boolean success = sut.extract(A, extractMode, destination); @@ -215,13 +215,13 @@ void shouldExtractFromSourceToDestination(final GridExtractMode extractMode) { case SINGLE_RESOURCE -> 1; }; - assertThat(storageChannel.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( + assertThat(rootStorage.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( new ResourceAmount(A, 100 - expectedExtracted) ); assertThat(destination.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( new ResourceAmount(A, expectedExtracted) ); - assertThat(storageChannel.findTrackedResourceByActorType(A, GridActor.class)) + assertThat(rootStorage.findTrackedResourceByActorType(A, GridActor.class)) .get() .usingRecursiveComparison() .isEqualTo(new TrackedResource(GridActor.NAME, 0)); @@ -234,16 +234,16 @@ void shouldNotExtractFromSourceWhenResourceIsNotPresentInSource(final GridExtrac final Storage destination = new LimitedStorageImpl(100); final Storage source = new TrackedStorageImpl(new LimitedStorageImpl(100), () -> 0L); - storageChannel.addSource(source); + rootStorage.addSource(source); // Act final boolean success = sut.extract(A, extractMode, destination); // Assert assertThat(success).isFalse(); - assertThat(storageChannel.getAll()).isEmpty(); + assertThat(rootStorage.getAll()).isEmpty(); assertThat(destination.getAll()).isEmpty(); - assertThat(storageChannel.findTrackedResourceByActorType(A, GridActor.class)).isNotPresent(); + assertThat(rootStorage.findTrackedResourceByActorType(A, GridActor.class)).isNotPresent(); } @ParameterizedTest @@ -254,21 +254,21 @@ void shouldNotExtractFromSourceIfThereIsNoSpaceInDestination(final GridExtractMo destination.insert(B, 100, Action.EXECUTE, EmptyActor.INSTANCE); final Storage source = new TrackedStorageImpl(new LimitedStorageImpl(100), () -> 0L); - storageChannel.addSource(source); - storageChannel.insert(A, 100, Action.EXECUTE, EmptyActor.INSTANCE); + rootStorage.addSource(source); + rootStorage.insert(A, 100, Action.EXECUTE, EmptyActor.INSTANCE); // Act final boolean success = sut.extract(A, extractMode, destination); // Assert assertThat(success).isFalse(); - assertThat(storageChannel.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( + assertThat(rootStorage.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( new ResourceAmount(A, 100) ); assertThat(destination.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( new ResourceAmount(B, 100) ); - assertThat(storageChannel.findTrackedResourceByActorType(A, GridActor.class)).isEmpty(); + assertThat(rootStorage.findTrackedResourceByActorType(A, GridActor.class)).isEmpty(); } } @@ -281,19 +281,19 @@ void shouldExtractEntireResourceFromSourceToDestinationIfResourceIsLessThanMaxCo final Storage destination = new LimitedStorageImpl(100); final Storage source = new TrackedStorageImpl(new LimitedStorageImpl(100), () -> 0L); - storageChannel.addSource(source); - storageChannel.insert(A, MAX_COUNT - 1, Action.EXECUTE, EmptyActor.INSTANCE); + rootStorage.addSource(source); + rootStorage.insert(A, MAX_COUNT - 1, Action.EXECUTE, EmptyActor.INSTANCE); // Act final boolean success = sut.extract(A, GridExtractMode.ENTIRE_RESOURCE, destination); // Assert assertThat(success).isTrue(); - assertThat(storageChannel.getAll()).isEmpty(); + assertThat(rootStorage.getAll()).isEmpty(); assertThat(destination.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( new ResourceAmount(A, MAX_COUNT - 1) ); - assertThat(storageChannel.findTrackedResourceByActorType(A, GridActor.class)) + assertThat(rootStorage.findTrackedResourceByActorType(A, GridActor.class)) .get() .usingRecursiveComparison() .isEqualTo(new TrackedResource(GridActor.NAME, 0)); @@ -306,21 +306,21 @@ void shouldExtractEntireResourceWithRemainderFromSourceToDestinationIfThereIsNot final Storage destination = new LimitedStorageImpl(MAX_COUNT - 1); final Storage source = new TrackedStorageImpl(new LimitedStorageImpl(100), () -> 0L); - storageChannel.addSource(source); - storageChannel.insert(A, 100, Action.EXECUTE, EmptyActor.INSTANCE); + rootStorage.addSource(source); + rootStorage.insert(A, 100, Action.EXECUTE, EmptyActor.INSTANCE); // Act final boolean success = sut.extract(A, GridExtractMode.ENTIRE_RESOURCE, destination); // Assert assertThat(success).isTrue(); - assertThat(storageChannel.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( + assertThat(rootStorage.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( new ResourceAmount(A, 100 - MAX_COUNT + 1) ); assertThat(destination.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( new ResourceAmount(A, MAX_COUNT - 1) ); - assertThat(storageChannel.findTrackedResourceByActorType(A, GridActor.class)) + assertThat(rootStorage.findTrackedResourceByActorType(A, GridActor.class)) .get() .usingRecursiveComparison() .isEqualTo(new TrackedResource(GridActor.NAME, 0)); @@ -336,19 +336,19 @@ void shouldExtractSingleAmountIfResourceHasSingleAmountWhenExtractingHalfResourc final Storage destination = new LimitedStorageImpl(MAX_COUNT); final Storage source = new TrackedStorageImpl(new LimitedStorageImpl(100), () -> 0L); - storageChannel.addSource(source); - storageChannel.insert(A, 1, Action.EXECUTE, EmptyActor.INSTANCE); + rootStorage.addSource(source); + rootStorage.insert(A, 1, Action.EXECUTE, EmptyActor.INSTANCE); // Act final boolean success = sut.extract(A, GridExtractMode.HALF_RESOURCE, destination); // Assert assertThat(success).isTrue(); - assertThat(storageChannel.getAll()).isEmpty(); + assertThat(rootStorage.getAll()).isEmpty(); assertThat(destination.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( new ResourceAmount(A, 1) ); - assertThat(storageChannel.findTrackedResourceByActorType(A, GridActor.class)) + assertThat(rootStorage.findTrackedResourceByActorType(A, GridActor.class)) .get() .usingRecursiveComparison() .isEqualTo(new TrackedResource(GridActor.NAME, 0)); diff --git a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManagerImplTest.java b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManagerImplTest.java index efcfbf5da..77e0b2814 100644 --- a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManagerImplTest.java +++ b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManagerImplTest.java @@ -3,8 +3,8 @@ import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannelImpl; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; +import com.refinedmods.refinedstorage.api.storage.root.RootStorageImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -24,24 +24,24 @@ class GridWatcherManagerImplTest { GridWatcherManager sut; - StorageChannel storageChannel; + RootStorage rootStorage; @BeforeEach void setUp() { sut = new GridWatcherManagerImpl(); - storageChannel = new StorageChannelImpl(); - storageChannel.addSource(new InMemoryStorageImpl()); + rootStorage = new RootStorageImpl(); + rootStorage.addSource(new InMemoryStorageImpl()); } @Test void shouldAddWatcherAndNotifyOfChanges() { // Arrange final GridWatcher watcher = mock(GridWatcher.class); - storageChannel.insert(A, 10, Action.EXECUTE, FakeActor.INSTANCE); + rootStorage.insert(A, 10, Action.EXECUTE, FakeActor.INSTANCE); // Act - sut.addWatcher(watcher, FakeActor.class, storageChannel); - storageChannel.insert(B, 5, Action.EXECUTE, FakeActor.INSTANCE); + sut.addWatcher(watcher, FakeActor.class, rootStorage); + rootStorage.insert(B, 5, Action.EXECUTE, FakeActor.INSTANCE); // Assert verify(watcher, times(1)).onChanged(B, 5, null); @@ -52,12 +52,12 @@ void shouldAddWatcherAndNotifyOfChanges() { void shouldNotAddDuplicateWatcher() { // Arrange final GridWatcher watcher = mock(GridWatcher.class); - sut.addWatcher(watcher, FakeActor.class, storageChannel); + sut.addWatcher(watcher, FakeActor.class, rootStorage); // Act & assert assertThrows( IllegalArgumentException.class, - () -> sut.addWatcher(watcher, FakeActor.class, storageChannel), + () -> sut.addWatcher(watcher, FakeActor.class, rootStorage), "Watcher is already registered" ); } @@ -66,12 +66,12 @@ void shouldNotAddDuplicateWatcher() { void shouldRemoveWatcher() { // Arrange final GridWatcher watcher = mock(GridWatcher.class); - storageChannel.insert(A, 10, Action.EXECUTE, FakeActor.INSTANCE); - sut.addWatcher(watcher, FakeActor.class, storageChannel); + rootStorage.insert(A, 10, Action.EXECUTE, FakeActor.INSTANCE); + sut.addWatcher(watcher, FakeActor.class, rootStorage); // Act - sut.removeWatcher(watcher, storageChannel); - storageChannel.insert(B, 5, Action.EXECUTE, FakeActor.INSTANCE); + sut.removeWatcher(watcher, rootStorage); + rootStorage.insert(B, 5, Action.EXECUTE, FakeActor.INSTANCE); // Assert verifyNoInteractions(watcher); @@ -85,7 +85,7 @@ void shouldNotRemoveWatcherThatIsNotRegistered() { // Act & assert assertThrows( IllegalArgumentException.class, - () -> sut.removeWatcher(watcher, storageChannel), + () -> sut.removeWatcher(watcher, rootStorage), "Watcher is not registered" ); } @@ -94,15 +94,15 @@ void shouldNotRemoveWatcherThatIsNotRegistered() { void shouldAddAndRemoveAndAddWatcherAgain() { // Arrange final GridWatcher watcher = mock(GridWatcher.class); - storageChannel.insert(A, 10, Action.EXECUTE, FakeActor.INSTANCE); + rootStorage.insert(A, 10, Action.EXECUTE, FakeActor.INSTANCE); // Act - sut.addWatcher(watcher, FakeActor.class, storageChannel); - storageChannel.insert(B, 5, Action.EXECUTE, FakeActor.INSTANCE); - sut.removeWatcher(watcher, storageChannel); - storageChannel.insert(C, 4, Action.EXECUTE, FakeActor.INSTANCE); - sut.addWatcher(watcher, FakeActor.class, storageChannel); - storageChannel.insert(D, 3, Action.EXECUTE, FakeActor.INSTANCE); + sut.addWatcher(watcher, FakeActor.class, rootStorage); + rootStorage.insert(B, 5, Action.EXECUTE, FakeActor.INSTANCE); + sut.removeWatcher(watcher, rootStorage); + rootStorage.insert(C, 4, Action.EXECUTE, FakeActor.INSTANCE); + sut.addWatcher(watcher, FakeActor.class, rootStorage); + rootStorage.insert(D, 3, Action.EXECUTE, FakeActor.INSTANCE); // Assert verify(watcher, times(1)).onChanged(B, 5, null); @@ -114,16 +114,16 @@ void shouldAddAndRemoveAndAddWatcherAgain() { void shouldDetachAll() { // Arrange final GridWatcher watcher = mock(GridWatcher.class); - storageChannel.insert(A, 10, Action.EXECUTE, FakeActor.INSTANCE); - sut.addWatcher(watcher, FakeActor.class, storageChannel); + rootStorage.insert(A, 10, Action.EXECUTE, FakeActor.INSTANCE); + sut.addWatcher(watcher, FakeActor.class, rootStorage); // Act - sut.detachAll(storageChannel); - storageChannel.insert(B, 10, Action.EXECUTE, FakeActor.INSTANCE); + sut.detachAll(rootStorage); + rootStorage.insert(B, 10, Action.EXECUTE, FakeActor.INSTANCE); assertThrows(IllegalArgumentException.class, () -> sut.addWatcher( watcher, FakeActor.class, - storageChannel + rootStorage ), "Watcher is already registered"); // Assert @@ -134,14 +134,14 @@ void shouldDetachAll() { void shouldAttachAll() { // Arrange final GridWatcher watcher = mock(GridWatcher.class); - storageChannel.insert(A, 10, Action.EXECUTE, FakeActor.INSTANCE); - sut.addWatcher(watcher, FakeActor.class, storageChannel); - sut.detachAll(storageChannel); - storageChannel.insert(B, 5, Action.EXECUTE, FakeActor.INSTANCE); + rootStorage.insert(A, 10, Action.EXECUTE, FakeActor.INSTANCE); + sut.addWatcher(watcher, FakeActor.class, rootStorage); + sut.detachAll(rootStorage); + rootStorage.insert(B, 5, Action.EXECUTE, FakeActor.INSTANCE); // Act - sut.attachAll(storageChannel); - storageChannel.insert(C, 4, Action.EXECUTE, FakeActor.INSTANCE); + sut.attachAll(rootStorage); + rootStorage.insert(C, 4, Action.EXECUTE, FakeActor.INSTANCE); // Assert final InOrder inOrder = inOrder(watcher); @@ -157,7 +157,7 @@ void shouldNotifyAboutActivenessChange() { // Arrange final GridWatcher watcher = mock(GridWatcher.class); sut.activeChanged(true); - sut.addWatcher(watcher, FakeActor.class, storageChannel); + sut.addWatcher(watcher, FakeActor.class, rootStorage); // Act sut.activeChanged(false); diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/FluidGridExtractionStrategy.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/FluidGridExtractionStrategy.java index 3e500953b..f73c3eb51 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/FluidGridExtractionStrategy.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/FluidGridExtractionStrategy.java @@ -51,10 +51,10 @@ public boolean onExtract(final PlatformResourceKey resource, final boolean cursor) { if (resource instanceof FluidResource fluidResource) { final boolean bucketInInventory = hasBucketInInventory(); - final boolean bucketInStorageChannel = hasBucketInStorage(); + final boolean bucketInStorage = hasBucketInStorage(); if (bucketInInventory) { extract(fluidResource, extractMode, cursor, true); - } else if (bucketInStorageChannel) { + } else if (bucketInStorage) { extract(fluidResource, extractMode, cursor, false); } return true; diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/storage/StorageNetworkComponent.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/storage/StorageNetworkComponent.java index 7e46b6529..9c3608305 100644 --- a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/storage/StorageNetworkComponent.java +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/storage/StorageNetworkComponent.java @@ -4,14 +4,14 @@ import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.Storage; import com.refinedmods.refinedstorage.api.storage.TrackedResourceAmount; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import java.util.List; import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.1.1") -public interface StorageNetworkComponent extends NetworkComponent, StorageChannel { +public interface StorageNetworkComponent extends NetworkComponent, RootStorage { List getResources(Class actorType); boolean contains(Storage storage); diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/storage/StorageProvider.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/storage/StorageProvider.java index 17ac3a481..b1437aa19 100644 --- a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/storage/StorageProvider.java +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/storage/StorageProvider.java @@ -1,13 +1,14 @@ package com.refinedmods.refinedstorage.api.network.storage; import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import org.apiguardian.api.API; /** * Implement this on {@link com.refinedmods.refinedstorage.api.network.node.NetworkNode}s that can provide a storage * to the network. - * Never modify a {@link com.refinedmods.refinedstorage.api.storage.channel.StorageChannel} + * Never modify a {@link RootStorage} * from a {@link com.refinedmods.refinedstorage.api.network.node.NetworkNode} directly. * Use this interface to help you manage the lifecycle of your storage, to ensure that your storage is added or removed * in the right cases. diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/AbstractDetectorAmountStrategy.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/AbstractDetectorAmountStrategy.java index b139f568d..7335a2b63 100644 --- a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/AbstractDetectorAmountStrategy.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/AbstractDetectorAmountStrategy.java @@ -2,10 +2,10 @@ import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; public abstract class AbstractDetectorAmountStrategy implements DetectorAmountStrategy { - protected StorageChannel getStorageChannel(final Network network) { + protected RootStorage getRootStorage(final Network network) { return network.getComponent(StorageNetworkComponent.class); } } diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorAmountStrategyImpl.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorAmountStrategyImpl.java index 3b0ef8c65..d07e877fe 100644 --- a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorAmountStrategyImpl.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorAmountStrategyImpl.java @@ -7,7 +7,7 @@ public class DetectorAmountStrategyImpl extends AbstractDetectorAmountStrategy { @Override public long getAmount(final Network network, final ResourceKey configuredResource) { - return getStorageChannel(network) + return getRootStorage(network) .get(configuredResource) .map(ResourceAmount::getAmount) .orElse(0L); diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/ExporterTransferStrategyImpl.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/ExporterTransferStrategyImpl.java index 0118f91b0..d948619a5 100644 --- a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/ExporterTransferStrategyImpl.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/ExporterTransferStrategyImpl.java @@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; import com.refinedmods.refinedstorage.api.storage.TransferHelper; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import java.util.Collection; import java.util.Collections; @@ -22,40 +22,40 @@ public ExporterTransferStrategyImpl(final InsertableStorage destination, final l } /** - * @param resource the resource to expand - * @param storageChannel the storage channel belonging to the resource + * @param resource the resource to expand + * @param rootStorage the storage belonging to the resource * @return the list of expanded resources, will be tried out in the order of the list. Can be empty. */ - protected Collection expand(final ResourceKey resource, final StorageChannel storageChannel) { + protected Collection expand(final ResourceKey resource, final RootStorage rootStorage) { return Collections.singletonList(resource); } @Override public boolean transfer(final ResourceKey resource, final Actor actor, final Network network) { - final StorageChannel storageChannel = network.getComponent(StorageNetworkComponent.class); - final Collection expanded = expand(resource, storageChannel); - return tryTransferExpanded(actor, storageChannel, expanded); + final RootStorage rootStorage = network.getComponent(StorageNetworkComponent.class); + final Collection expanded = expand(resource, rootStorage); + return tryTransferExpanded(actor, rootStorage, expanded); } private boolean tryTransferExpanded(final Actor actor, - final StorageChannel storageChannel, + final RootStorage rootStorage, final Collection expanded) { for (final ResourceKey resource : expanded) { - if (tryTransfer(actor, storageChannel, resource)) { + if (tryTransfer(actor, rootStorage, resource)) { return true; } } return false; } - private boolean tryTransfer(final Actor actor, final StorageChannel storageChannel, final ResourceKey resource) { + private boolean tryTransfer(final Actor actor, final RootStorage rootStorage, final ResourceKey resource) { final long transferred = TransferHelper.transfer( resource, transferQuota, actor, - storageChannel, + rootStorage, destination, - storageChannel + rootStorage ); return transferred > 0; } diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceExportState.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceExportState.java index 2c71fb43f..ed4ea494e 100644 --- a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceExportState.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceExportState.java @@ -2,7 +2,7 @@ import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import java.util.Collection; import javax.annotation.Nullable; @@ -10,7 +10,7 @@ public interface InterfaceExportState { int getSlots(); - Collection expandExportCandidates(StorageChannel storageChannel, ResourceKey resource); + Collection expandExportCandidates(RootStorage rootStorage, ResourceKey resource); boolean isExportedResourceValid(ResourceKey want, ResourceKey got); diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceNetworkNode.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceNetworkNode.java index 994f6ea7c..6b3cf3b47 100644 --- a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceNetworkNode.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceNetworkNode.java @@ -9,7 +9,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.Storage; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import java.util.Collection; import java.util.function.ToLongFunction; @@ -92,9 +92,9 @@ private void doExport(final InterfaceExportState state, private void clearExportedResource(final InterfaceExportState state, final int slot, final ResourceKey got, - final StorageChannel storageChannel) { + final RootStorage rootStorage) { final long currentAmount = state.getExportedAmount(slot); - final long inserted = storageChannel.insert( + final long inserted = rootStorage.insert( got, Math.min(currentAmount, transferQuotaProvider.applyAsLong(got)), Action.EXECUTE, @@ -109,11 +109,11 @@ private void clearExportedResource(final InterfaceExportState state, private void doInitialExport(final InterfaceExportState state, final int slot, final ResourceKey want, - final StorageChannel storageChannel) { + final RootStorage rootStorage) { final long wantedAmount = state.getRequestedAmount(slot); - final Collection candidates = state.expandExportCandidates(storageChannel, want); + final Collection candidates = state.expandExportCandidates(rootStorage, want); for (final ResourceKey candidate : candidates) { - final long extracted = storageChannel.extract( + final long extracted = rootStorage.extract( candidate, Math.min(transferQuotaProvider.applyAsLong(want), wantedAmount), Action.EXECUTE, @@ -144,9 +144,9 @@ private void exportAdditionalResources(final InterfaceExportState state, final int slot, final ResourceKey got, final long amount, - final StorageChannel storageChannel) { + final RootStorage rootStorage) { final long correctedAmount = Math.min(transferQuotaProvider.applyAsLong(got), amount); - final long extracted = storageChannel.extract(got, correctedAmount, Action.EXECUTE, actor); + final long extracted = rootStorage.extract(got, correctedAmount, Action.EXECUTE, actor); if (extracted == 0) { return; } @@ -157,9 +157,9 @@ private void returnExportedResource(final InterfaceExportState state, final int slot, final ResourceKey got, final long amount, - final StorageChannel storageChannel) { + final RootStorage rootStorage) { final long correctedAmount = Math.min(transferQuotaProvider.applyAsLong(got), Math.abs(amount)); - final long inserted = storageChannel.insert(got, correctedAmount, Action.EXECUTE, actor); + final long inserted = rootStorage.insert(got, correctedAmount, Action.EXECUTE, actor); if (inserted == 0) { return; } diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/ImporterTransferStrategyImpl.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/ImporterTransferStrategyImpl.java index 5f09e2b49..aac77cfb4 100644 --- a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/ImporterTransferStrategyImpl.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/ImporterTransferStrategyImpl.java @@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.api.resource.filter.Filter; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.TransferHelper; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import java.util.Iterator; import java.util.Objects; @@ -26,20 +26,20 @@ public ImporterTransferStrategyImpl(final ImporterSource source, final long tran @Override public boolean transfer(final Filter filter, final Actor actor, final Network network) { - final StorageChannel storageChannel = network.getComponent(StorageNetworkComponent.class); - return transfer(filter, actor, storageChannel); + final RootStorage rootStorage = network.getComponent(StorageNetworkComponent.class); + return transfer(filter, actor, rootStorage); } - private boolean transfer(final Filter filter, final Actor actor, final StorageChannel storageChannel) { + private boolean transfer(final Filter filter, final Actor actor, final RootStorage rootStorage) { long totalTransferred = 0; ResourceKey workingResource = null; final Iterator iterator = source.getResources(); while (iterator.hasNext() && totalTransferred < transferQuota) { final ResourceKey resource = iterator.next(); if (workingResource != null) { - totalTransferred += performTransfer(storageChannel, actor, totalTransferred, workingResource, resource); + totalTransferred += performTransfer(rootStorage, actor, totalTransferred, workingResource, resource); } else if (filter.isAllowed(resource)) { - final long transferred = performTransfer(storageChannel, actor, totalTransferred, resource); + final long transferred = performTransfer(rootStorage, actor, totalTransferred, resource); if (transferred > 0) { workingResource = resource; } @@ -49,18 +49,18 @@ private boolean transfer(final Filter filter, final Actor actor, final StorageCh return totalTransferred > 0; } - private long performTransfer(final StorageChannel storageChannel, + private long performTransfer(final RootStorage rootStorage, final Actor actor, final long totalTransferred, final ResourceKey workingResource, final ResourceKey resource) { if (Objects.equals(workingResource, resource)) { - return performTransfer(storageChannel, actor, totalTransferred, resource); + return performTransfer(rootStorage, actor, totalTransferred, resource); } return 0L; } - private long performTransfer(final StorageChannel storageChannel, + private long performTransfer(final RootStorage rootStorage, final Actor actor, final long totalTransferred, final ResourceKey resource) { @@ -69,7 +69,7 @@ private long performTransfer(final StorageChannel storageChannel, transferQuota - totalTransferred, actor, source, - storageChannel, + rootStorage, source ); } diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/StorageNetworkComponentImpl.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/StorageNetworkComponentImpl.java index 144a71d71..d0535d17c 100644 --- a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/StorageNetworkComponentImpl.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/StorageNetworkComponentImpl.java @@ -7,14 +7,14 @@ import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.Storage; import com.refinedmods.refinedstorage.api.storage.TrackedResourceAmount; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannelImpl; +import com.refinedmods.refinedstorage.api.storage.root.RootStorageImpl; import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class StorageNetworkComponentImpl extends StorageChannelImpl implements StorageNetworkComponent { +public class StorageNetworkComponentImpl extends RootStorageImpl implements StorageNetworkComponent { private static final Logger LOGGER = LoggerFactory.getLogger(StorageNetworkComponentImpl.class); public StorageNetworkComponentImpl(final ResourceList list) { diff --git a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceExportStateImpl.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceExportStateImpl.java index 25dab3158..3cdcf0350 100644 --- a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceExportStateImpl.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceExportStateImpl.java @@ -3,7 +3,7 @@ import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import java.util.ArrayList; import java.util.Collection; @@ -40,22 +40,22 @@ public int getSlots() { } @Override - public Collection expandExportCandidates(final StorageChannel storageChannel, + public Collection expandExportCandidates(final RootStorage rootStorage, final ResourceKey resource) { if (A.equals(resource)) { - return expandExportCandidates(storageChannel); + return expandExportCandidates(rootStorage); } return Collections.singletonList(resource); } - private Collection expandExportCandidates(final StorageChannel storageChannel) { + private Collection expandExportCandidates(final RootStorage rootStorage) { final List candidates = new ArrayList<>(); candidates.add(A); - // Simulate the behavior from FuzzyStorageChannel - if (storageChannel.get(A_ALTERNATIVE).isPresent()) { + // Simulate the behavior from FuzzyRootStorage + if (rootStorage.get(A_ALTERNATIVE).isPresent()) { candidates.add(A_ALTERNATIVE); } - if (storageChannel.get(A_ALTERNATIVE2).isPresent()) { + if (rootStorage.get(A_ALTERNATIVE2).isPresent()) { candidates.add(A_ALTERNATIVE2); } return candidates; diff --git a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannel.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/root/RootStorage.java similarity index 79% rename from refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannel.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/root/RootStorage.java index 2a54a342e..7a5920523 100644 --- a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannel.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/root/RootStorage.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.api.storage.channel; +package com.refinedmods.refinedstorage.api.storage.root; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; @@ -12,21 +12,21 @@ import org.apiguardian.api.API; /** - * A storage channel is the entry-point for various storage operations. + * The entry-point for various storage operations. * It acts as a storage, and is usually backed by a * {@link com.refinedmods.refinedstorage.api.storage.composite.CompositeStorage}. */ @API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") -public interface StorageChannel extends Storage, TrackedStorage { +public interface RootStorage extends Storage, TrackedStorage { /** - * Adds a listener to the storage channel. + * Adds a listener. * * @param listener the listener */ void addListener(ResourceListListener listener); /** - * Removes a listener from the storage channel. + * Removes a listener. * * @param listener the listener */ @@ -44,14 +44,14 @@ public interface StorageChannel extends Storage, TrackedStorage { void sortSources(); /** - * Adds a source to the channel and resorts all the sources. + * Adds a source and resorts all the sources. * * @param source the source */ void addSource(Storage source); /** - * Removes a source from the channel. + * Removes a source . * * @param source the source */ diff --git a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImpl.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/root/RootStorageImpl.java similarity index 93% rename from refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImpl.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/root/RootStorageImpl.java index 48882a351..92735fd32 100644 --- a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImpl.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/root/RootStorageImpl.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.api.storage.channel; +package com.refinedmods.refinedstorage.api.storage.root; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; @@ -19,15 +19,15 @@ import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") -public class StorageChannelImpl implements StorageChannel { +public class RootStorageImpl implements RootStorage { protected final CompositeStorageImpl storage; private final ListenableResourceList list; - public StorageChannelImpl() { + public RootStorageImpl() { this(new ResourceListImpl()); } - public StorageChannelImpl(final ResourceList list) { + public RootStorageImpl(final ResourceList list) { this.list = new ListenableResourceList(list); this.storage = new CompositeStorageImpl(this.list); } diff --git a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/package-info.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/root/package-info.java similarity index 77% rename from refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/package-info.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/root/package-info.java index b4779aeeb..ebe3af2f7 100644 --- a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/package-info.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/root/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.api.storage.channel; +package com.refinedmods.refinedstorage.api.storage.root; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/StorageChannelExternalStorageTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorageInRootStorageTest.java similarity index 68% rename from refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/StorageChannelExternalStorageTest.java rename to refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorageInRootStorageTest.java index ce320d947..e3e2b1880 100644 --- a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/StorageChannelExternalStorageTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorageInRootStorageTest.java @@ -4,8 +4,8 @@ import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.storage.EmptyActor; import com.refinedmods.refinedstorage.api.storage.Storage; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage.api.storage.channel.StorageChannelImpl; +import com.refinedmods.refinedstorage.api.storage.root.RootStorage; +import com.refinedmods.refinedstorage.api.storage.root.RootStorageImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -19,7 +19,7 @@ import static com.refinedmods.refinedstorage.api.storage.external.ExternalTestResource.B_TRANSFORMED; import static org.assertj.core.api.Assertions.assertThat; -class StorageChannelExternalStorageTest { +class ExternalStorageInRootStorageTest { SpyingExternalStorageListener listener; @BeforeEach @@ -33,16 +33,16 @@ void shouldNotTakeExistingResourcesIntoConsiderationWhenBuildingInitialState() { final Storage storage = new TransformingStorage(); storage.insert(A, 10, Action.EXECUTE, EmptyActor.INSTANCE); final Storage sut = new ExternalStorage(new ExternalStorageProviderImpl(storage), listener); - final StorageChannel storageChannel = new StorageChannelImpl(); + final RootStorage rootStorage = new RootStorageImpl(); // Act - storageChannel.addSource(sut); + rootStorage.addSource(sut); // Assert assertThat(sut.getAll()).isEmpty(); assertThat(sut.getStored()).isZero(); - assertThat(storageChannel.getAll()).isEmpty(); - assertThat(storageChannel.getStored()).isZero(); + assertThat(rootStorage.getAll()).isEmpty(); + assertThat(rootStorage.getStored()).isZero(); assertThat(listener.resources).isEmpty(); assertThat(listener.actors).isEmpty(); } @@ -53,43 +53,43 @@ void shouldTakeExistingResourcesIntoConsiderationWhenDetectingChanges() { final Storage storage = new TransformingStorage(); storage.insert(A, 10, Action.EXECUTE, EmptyActor.INSTANCE); final ExternalStorage sut = new ExternalStorage(new ExternalStorageProviderImpl(storage), listener); - final StorageChannel storageChannel = new StorageChannelImpl(); - storageChannel.addSource(sut); + final RootStorage rootStorage = new RootStorageImpl(); + rootStorage.addSource(sut); // Act sut.detectChanges(); // Assert - assertThat(storageChannel.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( + assertThat(rootStorage.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( new ResourceAmount(A_TRANSFORMED, 10) ); - assertThat(storageChannel.getStored()).isEqualTo(10); + assertThat(rootStorage.getStored()).isEqualTo(10); assertThat(listener.resources).isEmpty(); assertThat(listener.actors).isEmpty(); } @Test - void shouldNoLongerPropagateChangesToStorageChannelWhenRemoving() { + void shouldNoLongerPropagateChangesToRootStorageWhenRemoving() { // Arrange final Storage storage = new TransformingStorage(); storage.insert(A, 10, Action.EXECUTE, EmptyActor.INSTANCE); final Storage sut = new ExternalStorage(new ExternalStorageProviderImpl(storage), listener); - final StorageChannel storageChannel = new StorageChannelImpl(); - storageChannel.addSource(sut); + final RootStorage rootStorage = new RootStorageImpl(); + rootStorage.addSource(sut); // Act - storageChannel.insert(A, 5, Action.EXECUTE, EmptyActor.INSTANCE); - storageChannel.removeSource(sut); + rootStorage.insert(A, 5, Action.EXECUTE, EmptyActor.INSTANCE); + rootStorage.removeSource(sut); final long insertedStraightIntoExternalStorage = sut.insert(A, 10, Action.EXECUTE, EmptyActor.INSTANCE); - final long insertedIntoStorageChannel = storageChannel.insert(A, 10, Action.EXECUTE, EmptyActor.INSTANCE); + final long insertedIntoRootStorage = rootStorage.insert(A, 10, Action.EXECUTE, EmptyActor.INSTANCE); // Assert assertThat(insertedStraightIntoExternalStorage).isEqualTo(10); - assertThat(insertedIntoStorageChannel).isZero(); + assertThat(insertedIntoRootStorage).isZero(); assertThat(sut.getAll()).isNotEmpty(); assertThat(sut.getStored()).isEqualTo(25); - assertThat(storageChannel.getAll()).isEmpty(); - assertThat(storageChannel.getStored()).isZero(); + assertThat(rootStorage.getAll()).isEmpty(); + assertThat(rootStorage.getStored()).isZero(); assertThat(listener.resources).containsExactly(A, A); assertThat(listener.actors).containsOnly(EmptyActor.INSTANCE); } @@ -100,13 +100,13 @@ void shouldInsertAndDetectAndPropagateChanges(final Action action) { // Arrange final Storage storage = new TransformingStorage(); final Storage sut = new ExternalStorage(new ExternalStorageProviderImpl(storage), listener); - final StorageChannel storageChannel = new StorageChannelImpl(); - storageChannel.addSource(sut); + final RootStorage rootStorage = new RootStorageImpl(); + rootStorage.addSource(sut); // Act - final long insertedA1 = storageChannel.insert(A, 10, action, EmptyActor.INSTANCE); - final long insertedA2 = storageChannel.insert(A, 1, action, EmptyActor.INSTANCE); - final long insertedB = storageChannel.insert(B, 5, action, EmptyActor.INSTANCE); + final long insertedA1 = rootStorage.insert(A, 10, action, EmptyActor.INSTANCE); + final long insertedA2 = rootStorage.insert(A, 1, action, EmptyActor.INSTANCE); + final long insertedB = rootStorage.insert(B, 5, action, EmptyActor.INSTANCE); // Assert assertThat(insertedA1).isEqualTo(10); @@ -114,16 +114,16 @@ void shouldInsertAndDetectAndPropagateChanges(final Action action) { assertThat(insertedB).isEqualTo(5); if (action == Action.EXECUTE) { - assertThat(storageChannel.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( + assertThat(rootStorage.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( new ResourceAmount(A_TRANSFORMED, 11), new ResourceAmount(B_TRANSFORMED, 5) ); - assertThat(storageChannel.getStored()).isEqualTo(16); + assertThat(rootStorage.getStored()).isEqualTo(16); assertThat(listener.resources).containsExactly(A, A, B); assertThat(listener.actors).containsOnly(EmptyActor.INSTANCE); } else { - assertThat(storageChannel.getAll()).isEmpty(); - assertThat(storageChannel.getStored()).isZero(); + assertThat(rootStorage.getAll()).isEmpty(); + assertThat(rootStorage.getStored()).isZero(); assertThat(listener.resources).isEmpty(); assertThat(listener.actors).isEmpty(); } @@ -138,32 +138,32 @@ void shouldExtractPartiallyAndDetectAndPropagateChanges(final Action action) { sut.insert(A, 10, Action.EXECUTE, EmptyActor.INSTANCE); sut.insert(A_ALTERNATIVE, 10, Action.EXECUTE, EmptyActor.INSTANCE); sut.insert(B, 10, Action.EXECUTE, EmptyActor.INSTANCE); - final StorageChannel storageChannel = new StorageChannelImpl(); - storageChannel.addSource(sut); + final RootStorage rootStorage = new RootStorageImpl(); + rootStorage.addSource(sut); // Act // this will try to extract A!(5) and A2!(5/2) - final long extracted = storageChannel.extract(A_TRANSFORMED, 5, action, EmptyActor.INSTANCE); + final long extracted = rootStorage.extract(A_TRANSFORMED, 5, action, EmptyActor.INSTANCE); // Assert assertThat(extracted).isEqualTo(5); if (action == Action.EXECUTE) { - assertThat(storageChannel.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( + assertThat(rootStorage.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( new ResourceAmount(A_TRANSFORMED, 5), new ResourceAmount(A_ALTERNATIVE, 8), new ResourceAmount(B_TRANSFORMED, 10) ); - assertThat(storageChannel.getStored()).isEqualTo(23); + assertThat(rootStorage.getStored()).isEqualTo(23); assertThat(listener.resources).containsExactly(A, A_ALTERNATIVE, B, A_TRANSFORMED); assertThat(listener.actors).containsOnly(EmptyActor.INSTANCE); } else { - assertThat(storageChannel.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( + assertThat(rootStorage.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( new ResourceAmount(A_TRANSFORMED, 10), new ResourceAmount(A_ALTERNATIVE, 10), new ResourceAmount(B_TRANSFORMED, 10) ); - assertThat(storageChannel.getStored()).isEqualTo(30); + assertThat(rootStorage.getStored()).isEqualTo(30); assertThat(listener.resources).containsExactly(A, A_ALTERNATIVE, B); assertThat(listener.actors).containsOnly(EmptyActor.INSTANCE); } @@ -178,31 +178,31 @@ void shouldExtractCompletelyAndDetectAndPropagateChanges(final Action action) { sut.insert(A, 10, Action.EXECUTE, EmptyActor.INSTANCE); sut.insert(A_ALTERNATIVE, 10, Action.EXECUTE, EmptyActor.INSTANCE); sut.insert(B, 10, Action.EXECUTE, EmptyActor.INSTANCE); - final StorageChannel storageChannel = new StorageChannelImpl(); - storageChannel.addSource(sut); + final RootStorage rootStorage = new RootStorageImpl(); + rootStorage.addSource(sut); // Act // this will try to extract A!(10) and A2!(10/2) - final long extracted = storageChannel.extract(A_TRANSFORMED, 10, action, EmptyActor.INSTANCE); + final long extracted = rootStorage.extract(A_TRANSFORMED, 10, action, EmptyActor.INSTANCE); // Assert assertThat(extracted).isEqualTo(10); if (action == Action.EXECUTE) { - assertThat(storageChannel.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( + assertThat(rootStorage.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( new ResourceAmount(A_ALTERNATIVE, 5), new ResourceAmount(B_TRANSFORMED, 10) ); - assertThat(storageChannel.getStored()).isEqualTo(15); + assertThat(rootStorage.getStored()).isEqualTo(15); assertThat(listener.resources).containsExactly(A, A_ALTERNATIVE, B, A_TRANSFORMED); assertThat(listener.actors).containsOnly(EmptyActor.INSTANCE); } else { - assertThat(storageChannel.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( + assertThat(rootStorage.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( new ResourceAmount(A_TRANSFORMED, 10), new ResourceAmount(A_ALTERNATIVE, 10), new ResourceAmount(B_TRANSFORMED, 10) ); - assertThat(storageChannel.getStored()).isEqualTo(30); + assertThat(rootStorage.getStored()).isEqualTo(30); assertThat(listener.resources).containsExactly(A, A_ALTERNATIVE, B); assertThat(listener.actors).containsOnly(EmptyActor.INSTANCE); } diff --git a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImplTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/root/RootStorageImplTest.java similarity index 98% rename from refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImplTest.java rename to refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/root/RootStorageImplTest.java index 072a28d37..67896ab94 100644 --- a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImplTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/root/RootStorageImplTest.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.api.storage.channel; +package com.refinedmods.refinedstorage.api.storage.root; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; @@ -28,12 +28,12 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -class StorageChannelImplTest { - private StorageChannel sut; +class RootStorageImplTest { + private RootStorage sut; @BeforeEach void setUp() { - sut = new StorageChannelImpl(); + sut = new RootStorageImpl(); } @Test From f28697108ac5ab400687380f8caa7f4152d6abb1 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Tue, 23 Jul 2024 16:33:35 +0200 Subject: [PATCH 31/36] refactor: minor renames for network bound item Stores dimension for the player at start of the session (= now context). --- .../common/api/PlatformApi.java | 4 +- .../common/api/PlatformApiProxy.java | 6 +-- ...em.java => AbstractNetworkEnergyItem.java} | 30 +++++++-------- .../NetworkItemContext.java} | 4 +- .../NetworkItemHelper.java} | 6 +-- .../NetworkItemTargetBlockEntity.java} | 7 ++-- .../{bounditem => item}/package-info.java | 2 +- .../slotreference/SlotReferenceFactory.java | 1 + .../slotreference/SlotReferenceProvider.java | 1 + .../common/api/upgrade/UpgradeItem.java | 1 + .../common/AbstractClientModInitializer.java | 7 ++-- .../common/PlatformApiImpl.java | 10 ++--- .../common/grid/WirelessGrid.java | 24 ++++++------ .../common/grid/WirelessGridItem.java | 14 +++---- .../common/grid/WirelessGridOperations.java | 14 +++---- .../BaseNetworkNodeContainerBlockEntity.java | 6 +-- .../NetworkItemContextImpl.java} | 30 ++++++++------- .../NetworkItemHelperImpl.java} | 37 +++++++++---------- .../NetworkItemPropertyFunction.java} | 10 ++--- .../{bounditem => item}/package-info.java | 2 +- .../fabric/ClientModInitializerImpl.java | 10 ++--- .../neoforge/ClientModInitializer.java | 10 ++--- 22 files changed, 120 insertions(+), 116 deletions(-) rename refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/{AbstractNetworkBoundEnergyItem.java => AbstractNetworkEnergyItem.java} (71%) rename refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/{bounditem/NetworkBoundItemSession.java => item/NetworkItemContext.java} (86%) rename refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/{bounditem/NetworkBoundItemHelper.java => item/NetworkItemHelper.java} (83%) rename refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/{bounditem/NetworkBoundItemTargetBlockEntity.java => item/NetworkItemTargetBlockEntity.java} (71%) rename refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/{bounditem => item}/package-info.java (95%) rename refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/{bounditem/NetworkBoundItemSessionImpl.java => item/NetworkItemContextImpl.java} (77%) rename refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/{bounditem/NetworkBoundItemHelperImpl.java => item/NetworkItemHelperImpl.java} (73%) rename refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/{bounditem/NetworkBoundItemItemPropertyFunction.java => item/NetworkItemPropertyFunction.java} (71%) rename refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/{bounditem => item}/package-info.java (74%) diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/PlatformApi.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/PlatformApi.java index 99ea13e64..4ba3c3259 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/PlatformApi.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/PlatformApi.java @@ -32,7 +32,7 @@ import com.refinedmods.refinedstorage.common.api.support.energy.EnergyItemHelper; import com.refinedmods.refinedstorage.common.api.support.network.ConnectionLogic; import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemHelper; +import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemHelper; import com.refinedmods.refinedstorage.common.api.support.registry.PlatformRegistry; import com.refinedmods.refinedstorage.common.api.support.resource.RecipeModIngredientConverter; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainerInsertStrategy; @@ -186,7 +186,7 @@ EnergyStorage asBlockItemEnergyStorage( BlockEntityType blockEntityType ); - NetworkBoundItemHelper getNetworkBoundItemHelper(); + NetworkItemHelper getNetworkItemHelper(); PlatformRegistry getSlotReferenceFactoryRegistry(); diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/PlatformApiProxy.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/PlatformApiProxy.java index 33ea17001..a7764ee2c 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/PlatformApiProxy.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/PlatformApiProxy.java @@ -32,7 +32,7 @@ import com.refinedmods.refinedstorage.common.api.support.energy.EnergyItemHelper; import com.refinedmods.refinedstorage.common.api.support.network.ConnectionLogic; import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemHelper; +import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemHelper; import com.refinedmods.refinedstorage.common.api.support.registry.PlatformRegistry; import com.refinedmods.refinedstorage.common.api.support.resource.RecipeModIngredientConverter; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainerInsertStrategy; @@ -353,8 +353,8 @@ public EnergyStorage asBlockItemEnergyStorage(final EnergyStorage energyStorage, } @Override - public NetworkBoundItemHelper getNetworkBoundItemHelper() { - return ensureLoaded().getNetworkBoundItemHelper(); + public NetworkItemHelper getNetworkItemHelper() { + return ensureLoaded().getNetworkItemHelper(); } @Override diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractNetworkBoundEnergyItem.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractNetworkEnergyItem.java similarity index 71% rename from refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractNetworkBoundEnergyItem.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractNetworkEnergyItem.java index a3cea83ef..9f43cf1e2 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractNetworkBoundEnergyItem.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractNetworkEnergyItem.java @@ -1,8 +1,8 @@ package com.refinedmods.refinedstorage.common.api.support.energy; import com.refinedmods.refinedstorage.common.api.PlatformApi; -import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemHelper; -import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemSession; +import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemHelper; +import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemContext; import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceHandlerItem; @@ -23,24 +23,24 @@ import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.3.1") -public abstract class AbstractNetworkBoundEnergyItem extends AbstractEnergyItem implements SlotReferenceHandlerItem { - protected final NetworkBoundItemHelper networkBoundItemHelper; +public abstract class AbstractNetworkEnergyItem extends AbstractEnergyItem implements SlotReferenceHandlerItem { + protected final NetworkItemHelper networkItemHelper; - protected AbstractNetworkBoundEnergyItem(final Properties properties, - final EnergyItemHelper energyItemHelper, - final NetworkBoundItemHelper networkBoundItemHelper) { + protected AbstractNetworkEnergyItem(final Properties properties, + final EnergyItemHelper energyItemHelper, + final NetworkItemHelper networkItemHelper) { super(properties, energyItemHelper); - this.networkBoundItemHelper = networkBoundItemHelper; + this.networkItemHelper = networkItemHelper; } @Override public InteractionResult useOn(final UseOnContext ctx) { - return networkBoundItemHelper.bind(ctx); + return networkItemHelper.bind(ctx); } @Override public Optional getTooltipImage(final ItemStack stack) { - return networkBoundItemHelper.getTooltipImage(stack); + return networkItemHelper.getTooltipImage(stack); } @Override @@ -49,7 +49,7 @@ public void appendHoverText(final ItemStack stack, final List tooltip, final TooltipFlag flag) { super.appendHoverText(stack, context, tooltip, flag); - networkBoundItemHelper.addTooltip(stack, tooltip); + networkItemHelper.addTooltip(stack, tooltip); } @Override @@ -64,17 +64,17 @@ public InteractionResultHolder use(final Level level, final Player pl @Override public void use(final ServerPlayer player, final ItemStack stack, final SlotReference slotReference) { - final NetworkBoundItemSession session = PlatformApi.INSTANCE.getNetworkBoundItemHelper().openSession( + final NetworkItemContext context = PlatformApi.INSTANCE.getNetworkItemHelper().createContext( stack, player, slotReference ); - use(player, slotReference, session); + use(player, slotReference, context); } - protected abstract void use(ServerPlayer player, SlotReference slotReference, NetworkBoundItemSession session); + protected abstract void use(ServerPlayer player, SlotReference slotReference, NetworkItemContext context); public boolean isBound(final ItemStack stack) { - return networkBoundItemHelper.isBound(stack); + return networkItemHelper.isBound(stack); } } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/NetworkBoundItemSession.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/item/NetworkItemContext.java similarity index 86% rename from refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/NetworkBoundItemSession.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/item/NetworkItemContext.java index a5ebc18cb..51826357d 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/NetworkBoundItemSession.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/item/NetworkItemContext.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.common.api.support.network.bounditem; +package com.refinedmods.refinedstorage.common.api.support.network.item; import com.refinedmods.refinedstorage.api.network.Network; @@ -7,7 +7,7 @@ import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.3.1") -public interface NetworkBoundItemSession { +public interface NetworkItemContext { Optional resolveNetwork(); boolean isActive(); diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/NetworkBoundItemHelper.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/item/NetworkItemHelper.java similarity index 83% rename from refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/NetworkBoundItemHelper.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/item/NetworkItemHelper.java index 8c44742bd..c0ee9a1bf 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/NetworkBoundItemHelper.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/item/NetworkItemHelper.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.common.api.support.network.bounditem; +package com.refinedmods.refinedstorage.common.api.support.network.item; import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; @@ -14,14 +14,14 @@ import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.3.1") -public interface NetworkBoundItemHelper { +public interface NetworkItemHelper { void addTooltip(ItemStack stack, List lines); InteractionResult bind(UseOnContext ctx); Optional getTooltipImage(ItemStack stack); - NetworkBoundItemSession openSession(ItemStack stack, ServerPlayer player, SlotReference slotReference); + NetworkItemContext createContext(ItemStack stack, ServerPlayer player, SlotReference slotReference); boolean isBound(ItemStack stack); } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/NetworkBoundItemTargetBlockEntity.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/item/NetworkItemTargetBlockEntity.java similarity index 71% rename from refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/NetworkBoundItemTargetBlockEntity.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/item/NetworkItemTargetBlockEntity.java index a23287044..280e08922 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/NetworkBoundItemTargetBlockEntity.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/item/NetworkItemTargetBlockEntity.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage.common.api.support.network.bounditem; +package com.refinedmods.refinedstorage.common.api.support.network.item; import com.refinedmods.refinedstorage.api.network.Network; @@ -7,7 +7,8 @@ import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.3.6") -public interface NetworkBoundItemTargetBlockEntity { +@FunctionalInterface +public interface NetworkItemTargetBlockEntity { @Nullable - Network getNetworkForBoundItem(); + Network getNetworkForItem(); } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/package-info.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/item/package-info.java similarity index 95% rename from refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/package-info.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/item/package-info.java index cf593c9f5..8cefdc2cc 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/bounditem/package-info.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/item/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.common.api.support.network.bounditem; +package com.refinedmods.refinedstorage.common.api.support.network.item; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceFactory.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceFactory.java index 1cce040bc..ed1cb6416 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceFactory.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceFactory.java @@ -8,6 +8,7 @@ import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.3.1") +@FunctionalInterface public interface SlotReferenceFactory { StreamCodec STREAM_CODEC = StreamCodec.of( (buf, slotReference) -> { diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceProvider.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceProvider.java index 0a5c915d1..1189e3180 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceProvider.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceProvider.java @@ -8,6 +8,7 @@ import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.3.1") +@FunctionalInterface public interface SlotReferenceProvider { List find(Player player, Set validItems); } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeItem.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeItem.java index 2ae8b8a16..5ee85cbd7 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeItem.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/upgrade/UpgradeItem.java @@ -3,6 +3,7 @@ import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.2.10") +@FunctionalInterface public interface UpgradeItem { long getEnergyUsage(); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractClientModInitializer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractClientModInitializer.java index 397b17bbd..9f7836eb1 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractClientModInitializer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractClientModInitializer.java @@ -35,7 +35,6 @@ import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import com.refinedmods.refinedstorage.common.support.resource.ItemResourceRendering; import com.refinedmods.refinedstorage.common.upgrade.RegulatorUpgradeScreen; -import com.refinedmods.refinedstorage.common.util.IdentifierUtil; import com.refinedmods.refinedstorage.common.wirelesstransmitter.WirelessTransmitterScreen; import net.minecraft.client.KeyMapping; @@ -49,6 +48,8 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.MenuType; +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; + public abstract class AbstractClientModInitializer { protected static void registerScreens(final ScreenRegistration registration) { registration.register(Menus.INSTANCE.getDiskDrive(), DiskDriveScreen::new); @@ -111,7 +112,7 @@ protected static void handleInputEvents() { } protected static void registerDiskModels() { - final ResourceLocation diskModel = IdentifierUtil.createIdentifier("block/disk/disk"); + final ResourceLocation diskModel = createIdentifier("block/disk/disk"); for (final ItemStorageVariant variant : ItemStorageVariant.values()) { PlatformApi.INSTANCE.getStorageContainerItemHelper().registerDiskModel( Items.INSTANCE.getItemStorageDisk(variant), @@ -119,7 +120,7 @@ protected static void registerDiskModels() { ); } - final ResourceLocation fluidDiskModel = IdentifierUtil.createIdentifier("block/disk/fluid_disk"); + final ResourceLocation fluidDiskModel = createIdentifier("block/disk/fluid_disk"); for (final FluidStorageVariant variant : FluidStorageVariant.values()) { PlatformApi.INSTANCE.getStorageContainerItemHelper().registerDiskModel( Items.INSTANCE.getFluidStorageDisk(variant), diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformApiImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformApiImpl.java index f8f85d2ca..ebb2233ab 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformApiImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformApiImpl.java @@ -37,7 +37,7 @@ import com.refinedmods.refinedstorage.common.api.support.network.ConnectionLogic; import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemHelper; +import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemHelper; import com.refinedmods.refinedstorage.common.api.support.registry.PlatformRegistry; import com.refinedmods.refinedstorage.common.api.support.resource.RecipeModIngredientConverter; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainerInsertStrategy; @@ -68,7 +68,7 @@ import com.refinedmods.refinedstorage.common.support.energy.ItemEnergyStorage; import com.refinedmods.refinedstorage.common.support.network.ConnectionProviderImpl; import com.refinedmods.refinedstorage.common.support.network.InWorldNetworkNodeContainerImpl; -import com.refinedmods.refinedstorage.common.support.network.bounditem.NetworkBoundItemHelperImpl; +import com.refinedmods.refinedstorage.common.support.network.item.NetworkItemHelperImpl; import com.refinedmods.refinedstorage.common.support.packet.c2s.C2SPackets; import com.refinedmods.refinedstorage.common.support.packet.s2c.S2CPackets; import com.refinedmods.refinedstorage.common.support.registry.PlatformRegistryImpl; @@ -164,7 +164,7 @@ public class PlatformApiImpl implements PlatformApi { private final CompositeWirelessTransmitterRangeModifier wirelessTransmitterRangeModifier = new CompositeWirelessTransmitterRangeModifier(); private final EnergyItemHelper energyItemHelper = new EnergyItemHelperImpl(); - private final NetworkBoundItemHelper networkBoundItemHelper = new NetworkBoundItemHelperImpl(); + private final NetworkItemHelper networkItemHelper = new NetworkItemHelperImpl(); private final PlatformRegistry slotReferenceFactoryRegistry = new PlatformRegistryImpl<>(); private final CompositeSlotReferenceProvider slotReferenceProvider = new CompositeSlotReferenceProvider(); private final PlatformRegistry permissionRegistry = new PlatformRegistryImpl<>(); @@ -504,8 +504,8 @@ public EnergyStorage asBlockItemEnergyStorage(final EnergyStorage energyStorage, } @Override - public NetworkBoundItemHelper getNetworkBoundItemHelper() { - return networkBoundItemHelper; + public NetworkItemHelper getNetworkItemHelper() { + return networkItemHelper; } @Override diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGrid.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGrid.java index e8f159171..c7041aa98 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGrid.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGrid.java @@ -15,7 +15,7 @@ import com.refinedmods.refinedstorage.common.api.grid.Grid; import com.refinedmods.refinedstorage.common.api.security.PlatformSecurityNetworkComponent; import com.refinedmods.refinedstorage.common.api.storage.PlayerActor; -import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemSession; +import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemContext; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceType; import java.util.Collections; @@ -25,25 +25,25 @@ import net.minecraft.server.level.ServerPlayer; class WirelessGrid implements Grid { - private final NetworkBoundItemSession session; + private final NetworkItemContext context; private final GridWatcherManager watchers = new GridWatcherManagerImpl(); - WirelessGrid(final NetworkBoundItemSession session) { - this.session = session; + WirelessGrid(final NetworkItemContext context) { + this.context = context; } private Optional getStorage() { - return session.resolveNetwork().map(network -> network.getComponent(StorageNetworkComponent.class)); + return context.resolveNetwork().map(network -> network.getComponent(StorageNetworkComponent.class)); } private Optional getSecurity() { - return session.resolveNetwork().map(network -> network.getComponent(PlatformSecurityNetworkComponent.class)); + return context.resolveNetwork().map(network -> network.getComponent(PlatformSecurityNetworkComponent.class)); } @Override public void addWatcher(final GridWatcher watcher, final Class actorType) { - session.drainEnergy(Platform.INSTANCE.getConfig().getWirelessGrid().getOpenEnergyUsage()); - session.resolveNetwork().ifPresent(network -> watchers.addWatcher( + context.drainEnergy(Platform.INSTANCE.getConfig().getWirelessGrid().getOpenEnergyUsage()); + context.resolveNetwork().ifPresent(network -> watchers.addWatcher( watcher, actorType, network.getComponent(StorageNetworkComponent.class) @@ -52,7 +52,7 @@ public void addWatcher(final GridWatcher watcher, final Class a @Override public void removeWatcher(final GridWatcher watcher) { - session.resolveNetwork().ifPresent(network -> watchers.removeWatcher( + context.resolveNetwork().ifPresent(network -> watchers.removeWatcher( watcher, network.getComponent(StorageNetworkComponent.class) )); @@ -65,10 +65,10 @@ public Storage getItemStorage() { @Override public boolean isGridActive() { - final boolean networkActive = session.resolveNetwork().map( + final boolean networkActive = context.resolveNetwork().map( network -> network.getComponent(EnergyNetworkComponent.class).getStored() > 0 ).orElse(false); - return networkActive && session.isActive(); + return networkActive && context.isActive(); } @Override @@ -81,7 +81,7 @@ public GridOperations createOperations(final ResourceType resourceType, final Se return getStorage() .flatMap(rootStorage -> getSecurity().map(security -> createGridOperations(resourceType, player, rootStorage, security))) - .map(gridOperations -> (GridOperations) new WirelessGridOperations(gridOperations, session, watchers)) + .map(gridOperations -> (GridOperations) new WirelessGridOperations(gridOperations, context, watchers)) .orElseGet(NoopGridOperations::new); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridItem.java index dc4bb1da4..59b37b328 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridItem.java @@ -6,8 +6,8 @@ import com.refinedmods.refinedstorage.common.api.PlatformApi; import com.refinedmods.refinedstorage.common.api.grid.Grid; import com.refinedmods.refinedstorage.common.api.security.SecurityHelper; -import com.refinedmods.refinedstorage.common.api.support.energy.AbstractNetworkBoundEnergyItem; -import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemSession; +import com.refinedmods.refinedstorage.common.api.support.energy.AbstractNetworkEnergyItem; +import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemContext; import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; import com.refinedmods.refinedstorage.common.content.ContentNames; import com.refinedmods.refinedstorage.common.security.BuiltinPermission; @@ -16,12 +16,12 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -public class WirelessGridItem extends AbstractNetworkBoundEnergyItem { +public class WirelessGridItem extends AbstractNetworkEnergyItem { public WirelessGridItem() { super( new Item.Properties().stacksTo(1), PlatformApi.INSTANCE.getEnergyItemHelper(), - PlatformApi.INSTANCE.getNetworkBoundItemHelper() + PlatformApi.INSTANCE.getNetworkItemHelper() ); } @@ -35,15 +35,15 @@ public EnergyStorage createEnergyStorage(final ItemStack stack) { @Override protected void use(final ServerPlayer player, final SlotReference slotReference, - final NetworkBoundItemSession session) { - final boolean isAllowed = session.resolveNetwork() + final NetworkItemContext context) { + final boolean isAllowed = context.resolveNetwork() .map(network -> SecurityHelper.isAllowed(player, BuiltinPermission.OPEN, network)) .orElse(true); // if the network can't be resolved that will be apparent later in the UI. if (!isAllowed) { PlatformApi.INSTANCE.sendNoPermissionToOpenMessage(player, ContentNames.WIRELESS_GRID); return; } - final Grid grid = new WirelessGrid(session); + final Grid grid = new WirelessGrid(context); Platform.INSTANCE.getMenuOpener().openMenu(player, new WirelessGridExtendedMenuProvider(grid, slotReference)); } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridOperations.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridOperations.java index 031b38d59..4d00b84c3 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridOperations.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridOperations.java @@ -8,18 +8,18 @@ import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemSession; +import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemContext; class WirelessGridOperations implements GridOperations { private final GridOperations delegate; - private final NetworkBoundItemSession session; + private final NetworkItemContext context; private final GridWatcherManager watchers; WirelessGridOperations(final GridOperations delegate, - final NetworkBoundItemSession session, + final NetworkItemContext context, final GridWatcherManager watchers) { this.delegate = delegate; - this.session = session; + this.context = context; this.watchers = watchers; } @@ -46,9 +46,9 @@ public boolean insert(final ResourceKey resource, } private void drain(final long amount) { - final boolean wasActive = session.isActive(); - session.drainEnergy(amount); - final boolean isActive = session.isActive(); + final boolean wasActive = context.isActive(); + context.drainEnergy(amount); + final boolean isActive = context.isActive(); if (wasActive != isActive) { watchers.activeChanged(isActive); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/BaseNetworkNodeContainerBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/BaseNetworkNodeContainerBlockEntity.java index 4e7eb5615..84ad12112 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/BaseNetworkNodeContainerBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/BaseNetworkNodeContainerBlockEntity.java @@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.common.api.support.network.AbstractNetworkNodeContainerBlockEntity; import com.refinedmods.refinedstorage.common.api.support.network.ConnectionLogic; import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; -import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemTargetBlockEntity; +import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemTargetBlockEntity; import com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock; import com.refinedmods.refinedstorage.common.support.ColorableBlock; @@ -23,7 +23,7 @@ public class BaseNetworkNodeContainerBlockEntity extends AbstractNetworkNodeContainerBlockEntity - implements ConnectionLogic, NetworkBoundItemTargetBlockEntity { + implements ConnectionLogic, NetworkItemTargetBlockEntity { private static final Logger LOGGER = LoggerFactory.getLogger(BaseNetworkNodeContainerBlockEntity.class); private final RateLimiter activenessChangeRateLimiter = RateLimiter.create(1); @@ -159,7 +159,7 @@ public void setBlockState(final BlockState newBlockState) { @Nullable @Override - public Network getNetworkForBoundItem() { + public Network getNetworkForItem() { return mainNode.getNetwork(); } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/NetworkBoundItemSessionImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/item/NetworkItemContextImpl.java similarity index 77% rename from refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/NetworkBoundItemSessionImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/item/NetworkItemContextImpl.java index 760d4087c..2d26c5703 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/NetworkBoundItemSessionImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/item/NetworkItemContextImpl.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage.common.support.network.bounditem; +package com.refinedmods.refinedstorage.common.support.network.item; import com.refinedmods.refinedstorage.api.core.Action; import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.network.node.GraphNetworkComponent; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemSession; -import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemTargetBlockEntity; +import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemContext; +import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemTargetBlockEntity; import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; import com.refinedmods.refinedstorage.common.api.wirelesstransmitter.WirelessTransmitter; @@ -13,27 +13,33 @@ import javax.annotation.Nullable; import net.minecraft.core.GlobalPos; +import net.minecraft.resources.ResourceKey; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; -class NetworkBoundItemSessionImpl implements NetworkBoundItemSession { +class NetworkItemContextImpl implements NetworkItemContext { private final Player player; private final Vec3 playerPosition; + private final ResourceKey playerDimension; private final SlotReference slotReference; @Nullable private final GlobalPos networkLocation; - NetworkBoundItemSessionImpl( + @SuppressWarnings("resource") + NetworkItemContextImpl( final Player player, final SlotReference slotReference, @Nullable final GlobalPos networkLocation ) { this.player = player; - // We copy the player position as it can change after opening the network bound item (opening while walking) + // We copy the player position and dimension + // as it can change after opening the network bound item (opening while walking) // and could cause the network not being accessible anymore (due to being out of range of a transmitter). // If the network is no longer accessible, certain assumptions will break (e.g. grid watcher can no longer // be removed after it was added). this.playerPosition = new Vec3(player.position().x, player.position().y, player.position().z); + this.playerDimension = player.level().dimension(); this.slotReference = slotReference; this.networkLocation = networkLocation; } @@ -47,21 +53,17 @@ public Optional resolveNetwork() { .map(server -> server.getLevel(networkLocation.dimension())) .filter(level -> level.isLoaded(networkLocation.pos())) .map(level -> level.getBlockEntity(networkLocation.pos())) - .filter(NetworkBoundItemTargetBlockEntity.class::isInstance) - .map(NetworkBoundItemTargetBlockEntity.class::cast) - .map(NetworkBoundItemTargetBlockEntity::getNetworkForBoundItem) + .filter(NetworkItemTargetBlockEntity.class::isInstance) + .map(NetworkItemTargetBlockEntity.class::cast) + .map(NetworkItemTargetBlockEntity::getNetworkForItem) .filter(this::isInRange); } - @SuppressWarnings("resource") private boolean isInRange(final Network network) { return network.getComponent(GraphNetworkComponent.class) .getContainers(WirelessTransmitter.class) .stream() - .anyMatch(wirelessTransmitter -> wirelessTransmitter.isInRange( - player.level().dimension(), - playerPosition - )); + .anyMatch(wirelessTransmitter -> wirelessTransmitter.isInRange(playerDimension, playerPosition)); } @Override diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/NetworkBoundItemHelperImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/item/NetworkItemHelperImpl.java similarity index 73% rename from refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/NetworkBoundItemHelperImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/item/NetworkItemHelperImpl.java index 1e9069026..0d407a7fc 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/NetworkBoundItemHelperImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/item/NetworkItemHelperImpl.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage.common.support.network.bounditem; +package com.refinedmods.refinedstorage.common.support.network.item; import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemHelper; -import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemSession; -import com.refinedmods.refinedstorage.common.api.support.network.bounditem.NetworkBoundItemTargetBlockEntity; +import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemContext; +import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemHelper; +import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemTargetBlockEntity; import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; import com.refinedmods.refinedstorage.common.content.DataComponents; @@ -23,7 +23,7 @@ import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; -public class NetworkBoundItemHelperImpl implements NetworkBoundItemHelper { +public class NetworkItemHelperImpl implements NetworkItemHelper { private static final MutableComponent UNBOUND = createTranslation("item", "network_item.unbound") .withStyle(ChatFormatting.RED); private static final Component UNBOUND_HELP = createTranslation("item", "network_item.unbound.help"); @@ -35,16 +35,13 @@ public boolean isBound(final ItemStack stack) { @Override public void addTooltip(final ItemStack stack, final List lines) { - getNetworkLocation(stack).ifPresentOrElse( - network -> lines.add(createTranslation( - "item", - "network_item.bound_to", - network.pos().getX(), - network.pos().getY(), - network.pos().getZ() - ).withStyle(ChatFormatting.GRAY)), - () -> lines.add(UNBOUND) - ); + getNetworkLocation(stack).ifPresentOrElse(network -> lines.add(createTranslation( + "item", + "network_item.bound_to", + network.pos().getX(), + network.pos().getY(), + network.pos().getZ() + ).withStyle(ChatFormatting.GRAY)), () -> lines.add(UNBOUND)); } @Override @@ -54,7 +51,7 @@ public InteractionResult bind(final UseOnContext ctx) { } final ItemStack stack = ctx.getPlayer().getItemInHand(ctx.getHand()); final BlockEntity blockEntity = ctx.getLevel().getBlockEntity(ctx.getClickedPos()); - if (!(blockEntity instanceof NetworkBoundItemTargetBlockEntity)) { + if (!(blockEntity instanceof NetworkItemTargetBlockEntity)) { return InteractionResult.PASS; } final GlobalPos pos = GlobalPos.of(ctx.getLevel().dimension(), blockEntity.getBlockPos()); @@ -71,11 +68,11 @@ public Optional getTooltipImage(final ItemStack stack) { } @Override - public NetworkBoundItemSession openSession(final ItemStack stack, - final ServerPlayer player, - final SlotReference slotReference) { + public NetworkItemContext createContext(final ItemStack stack, + final ServerPlayer player, + final SlotReference slotReference) { final Optional location = getNetworkLocation(stack); - return new NetworkBoundItemSessionImpl( + return new NetworkItemContextImpl( player, slotReference, location.orElse(null) diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/item/NetworkItemPropertyFunction.java similarity index 71% rename from refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/item/NetworkItemPropertyFunction.java index 07706a4d9..eac894531 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/item/NetworkItemPropertyFunction.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage.common.support.network.bounditem; +package com.refinedmods.refinedstorage.common.support.network.item; -import com.refinedmods.refinedstorage.common.api.support.energy.AbstractNetworkBoundEnergyItem; +import com.refinedmods.refinedstorage.common.api.support.energy.AbstractNetworkEnergyItem; import javax.annotation.Nullable; @@ -12,7 +12,7 @@ import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; -public class NetworkBoundItemItemPropertyFunction implements ClampedItemPropertyFunction { +public class NetworkItemPropertyFunction implements ClampedItemPropertyFunction { public static final ResourceLocation NAME = createIdentifier("network_bound_active"); @Override @@ -20,8 +20,8 @@ public float unclampedCall(final ItemStack itemStack, @Nullable final ClientLevel clientLevel, @Nullable final LivingEntity livingEntity, final int i) { - if (itemStack.getItem() instanceof AbstractNetworkBoundEnergyItem boundItem) { - return boundItem.isBound(itemStack) ? 1 : 0; + if (itemStack.getItem() instanceof AbstractNetworkEnergyItem item) { + return item.isBound(itemStack) ? 1 : 0; } return 0; } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/package-info.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/item/package-info.java similarity index 74% rename from refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/package-info.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/item/package-info.java index 6b5d06a6e..ca1e56073 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/bounditem/package-info.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/item/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage.common.support.network.bounditem; +package com.refinedmods.refinedstorage.common.support.network.item; import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ClientModInitializerImpl.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ClientModInitializerImpl.java index 6fee96968..cb00fd976 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ClientModInitializerImpl.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ClientModInitializerImpl.java @@ -15,7 +15,7 @@ import com.refinedmods.refinedstorage.common.networking.NetworkCardItemPropertyFunction; import com.refinedmods.refinedstorage.common.security.SecurityCardItemPropertyFunction; import com.refinedmods.refinedstorage.common.storagemonitor.StorageMonitorBlockEntityRenderer; -import com.refinedmods.refinedstorage.common.support.network.bounditem.NetworkBoundItemItemPropertyFunction; +import com.refinedmods.refinedstorage.common.support.network.item.NetworkItemPropertyFunction; import com.refinedmods.refinedstorage.common.support.packet.PacketHandler; import com.refinedmods.refinedstorage.common.support.packet.s2c.EnergyInfoPacket; import com.refinedmods.refinedstorage.common.support.packet.s2c.GridActivePacket; @@ -423,13 +423,13 @@ private void registerModelPredicates() { private void registerItemProperties() { ItemProperties.register( Items.INSTANCE.getWirelessGrid(), - NetworkBoundItemItemPropertyFunction.NAME, - new NetworkBoundItemItemPropertyFunction() + NetworkItemPropertyFunction.NAME, + new NetworkItemPropertyFunction() ); ItemProperties.register( Items.INSTANCE.getCreativeWirelessGrid(), - NetworkBoundItemItemPropertyFunction.NAME, - new NetworkBoundItemItemPropertyFunction() + NetworkItemPropertyFunction.NAME, + new NetworkItemPropertyFunction() ); ItemProperties.register( Items.INSTANCE.getConfigurationCard(), diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ClientModInitializer.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ClientModInitializer.java index 890eed3b5..bba37a5c7 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ClientModInitializer.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ClientModInitializer.java @@ -14,7 +14,7 @@ import com.refinedmods.refinedstorage.common.networking.NetworkCardItemPropertyFunction; import com.refinedmods.refinedstorage.common.security.SecurityCardItemPropertyFunction; import com.refinedmods.refinedstorage.common.storagemonitor.StorageMonitorBlockEntityRenderer; -import com.refinedmods.refinedstorage.common.support.network.bounditem.NetworkBoundItemItemPropertyFunction; +import com.refinedmods.refinedstorage.common.support.network.item.NetworkItemPropertyFunction; import com.refinedmods.refinedstorage.common.support.tooltip.CompositeClientTooltipComponent; import com.refinedmods.refinedstorage.common.support.tooltip.HelpClientTooltipComponent; import com.refinedmods.refinedstorage.common.support.tooltip.ResourceClientTooltipComponent; @@ -211,13 +211,13 @@ private static CompositeClientTooltipComponent createRegulatorUpgradeClientToolt private static void registerItemProperties() { ItemProperties.register( Items.INSTANCE.getWirelessGrid(), - NetworkBoundItemItemPropertyFunction.NAME, - new NetworkBoundItemItemPropertyFunction() + NetworkItemPropertyFunction.NAME, + new NetworkItemPropertyFunction() ); ItemProperties.register( Items.INSTANCE.getCreativeWirelessGrid(), - NetworkBoundItemItemPropertyFunction.NAME, - new NetworkBoundItemItemPropertyFunction() + NetworkItemPropertyFunction.NAME, + new NetworkItemPropertyFunction() ); ItemProperties.register( Items.INSTANCE.getConfigurationCard(), From 77e867c41569ec8ac042f4ba1b133588523e03ee Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Tue, 23 Jul 2024 16:43:33 +0200 Subject: [PATCH 32/36] refactor: rename wireless transmitter api and make it part of network item api It essentially validates the player, so name it that way. --- .../energy/AbstractNetworkEnergyItem.java | 2 +- .../energy/TransferableBlockEntityEnergy.java | 1 + .../item/NetworkItemPlayerValidator.java | 15 +++++++++++++ .../WirelessTransmitter.java | 12 ----------- .../network/item/NetworkItemContextImpl.java | 21 +++++++++---------- ...relessTransmitterNetworkNodeContainer.java | 16 +++++++------- 6 files changed, 35 insertions(+), 32 deletions(-) create mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/item/NetworkItemPlayerValidator.java delete mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/wirelesstransmitter/WirelessTransmitter.java diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractNetworkEnergyItem.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractNetworkEnergyItem.java index 9f43cf1e2..ea0a9a2f1 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractNetworkEnergyItem.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractNetworkEnergyItem.java @@ -1,8 +1,8 @@ package com.refinedmods.refinedstorage.common.api.support.energy; import com.refinedmods.refinedstorage.common.api.PlatformApi; -import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemHelper; import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemContext; +import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemHelper; import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceHandlerItem; diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/TransferableBlockEntityEnergy.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/TransferableBlockEntityEnergy.java index c64b4a6e9..2fd3a75a6 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/TransferableBlockEntityEnergy.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/TransferableBlockEntityEnergy.java @@ -5,6 +5,7 @@ import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.3.1") +@FunctionalInterface public interface TransferableBlockEntityEnergy { EnergyStorage getEnergyStorage(); } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/item/NetworkItemPlayerValidator.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/item/NetworkItemPlayerValidator.java new file mode 100644 index 000000000..e5166da14 --- /dev/null +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/item/NetworkItemPlayerValidator.java @@ -0,0 +1,15 @@ +package com.refinedmods.refinedstorage.common.api.support.network.item; + +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.Vec3; +import org.apiguardian.api.API; + +@FunctionalInterface +@API(status = API.Status.STABLE, since = "2.0.0-milestone.4.5") +public interface NetworkItemPlayerValidator { + boolean isValid(PlayerCoordinates coordinates); + + record PlayerCoordinates(ResourceKey dimension, Vec3 position) { + } +} diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/wirelesstransmitter/WirelessTransmitter.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/wirelesstransmitter/WirelessTransmitter.java deleted file mode 100644 index ab78c05f4..000000000 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/wirelesstransmitter/WirelessTransmitter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.refinedmods.refinedstorage.common.api.wirelesstransmitter; - -import net.minecraft.resources.ResourceKey; -import net.minecraft.world.level.Level; -import net.minecraft.world.phys.Vec3; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.0") -@FunctionalInterface -public interface WirelessTransmitter { - boolean isInRange(ResourceKey dimension, Vec3 position); -} diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/item/NetworkItemContextImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/item/NetworkItemContextImpl.java index 2d26c5703..86da03cce 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/item/NetworkItemContextImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/item/NetworkItemContextImpl.java @@ -5,23 +5,20 @@ import com.refinedmods.refinedstorage.api.network.node.GraphNetworkComponent; import com.refinedmods.refinedstorage.common.Platform; import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemContext; +import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemPlayerValidator; import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemTargetBlockEntity; import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.common.api.wirelesstransmitter.WirelessTransmitter; import java.util.Optional; import javax.annotation.Nullable; import net.minecraft.core.GlobalPos; -import net.minecraft.resources.ResourceKey; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; class NetworkItemContextImpl implements NetworkItemContext { private final Player player; - private final Vec3 playerPosition; - private final ResourceKey playerDimension; + private final NetworkItemPlayerValidator.PlayerCoordinates coordinates; private final SlotReference slotReference; @Nullable private final GlobalPos networkLocation; @@ -38,8 +35,10 @@ class NetworkItemContextImpl implements NetworkItemContext { // and could cause the network not being accessible anymore (due to being out of range of a transmitter). // If the network is no longer accessible, certain assumptions will break (e.g. grid watcher can no longer // be removed after it was added). - this.playerPosition = new Vec3(player.position().x, player.position().y, player.position().z); - this.playerDimension = player.level().dimension(); + this.coordinates = new NetworkItemPlayerValidator.PlayerCoordinates( + player.level().dimension(), + new Vec3(player.position().x, player.position().y, player.position().z) + ); this.slotReference = slotReference; this.networkLocation = networkLocation; } @@ -56,14 +55,14 @@ public Optional resolveNetwork() { .filter(NetworkItemTargetBlockEntity.class::isInstance) .map(NetworkItemTargetBlockEntity.class::cast) .map(NetworkItemTargetBlockEntity::getNetworkForItem) - .filter(this::isInRange); + .filter(this::isValid); } - private boolean isInRange(final Network network) { + private boolean isValid(final Network network) { return network.getComponent(GraphNetworkComponent.class) - .getContainers(WirelessTransmitter.class) + .getContainers(NetworkItemPlayerValidator.class) .stream() - .anyMatch(wirelessTransmitter -> wirelessTransmitter.isInRange(playerDimension, playerPosition)); + .anyMatch(validator -> validator.isValid(coordinates)); } @Override diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java index 60ade3c61..97d680053 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java @@ -2,16 +2,15 @@ import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; import com.refinedmods.refinedstorage.common.api.support.network.ConnectionLogic; -import com.refinedmods.refinedstorage.common.api.wirelesstransmitter.WirelessTransmitter; +import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemPlayerValidator; import com.refinedmods.refinedstorage.common.support.network.InWorldNetworkNodeContainerImpl; import net.minecraft.core.BlockPos; -import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; class WirelessTransmitterNetworkNodeContainer extends InWorldNetworkNodeContainerImpl - implements WirelessTransmitter { + implements NetworkItemPlayerValidator { private final WirelessTransmitterBlockEntity blockEntity; private final AbstractNetworkNode node; @@ -25,19 +24,20 @@ class WirelessTransmitterNetworkNodeContainer extends InWorldNetworkNodeContaine } @Override - public boolean isInRange(final ResourceKey dimension, final Vec3 position) { + public boolean isValid(final PlayerCoordinates coordinates) { final Level level = blockEntity.getLevel(); - if (level == null || level.dimension() != dimension) { + if (level == null || level.dimension() != coordinates.dimension()) { return false; } if (!node.isActive()) { return false; } final BlockPos pos = blockEntity.getBlockPos(); + final Vec3 playerPos = coordinates.position(); final double distance = Math.sqrt( - Math.pow(pos.getX() - position.x(), 2) - + Math.pow(pos.getY() - position.y(), 2) - + Math.pow(pos.getZ() - position.z(), 2) + Math.pow(pos.getX() - playerPos.x(), 2) + + Math.pow(pos.getY() - playerPos.y(), 2) + + Math.pow(pos.getZ() - playerPos.z(), 2) ); return distance <= blockEntity.getRange(); } From 15500614bf84c45c2ce937826073394b6d00ee64 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Tue, 23 Jul 2024 20:12:59 +0200 Subject: [PATCH 33/36] feat: add neoforge block capability for network nodes Renames "PlatformApi" to "RefinedStorageApi" for consistency with "RefinedStorageNeoForgeApi". Introduces new "neoforge-api" module. Renames NetworkNodeContainerBlockEntity to NetworkNodeContainerProvider. Decouples ConnectionStrategy from block entities. Introduce builder for network node containers. --- .github/CONTRIBUTING.md | 29 +++--- .github/workflows/build.yml | 2 +- .github/workflows/draft-release.yml | 2 +- .../issue-for-unsupported-version.yml | 2 +- .github/workflows/publish-release.yml | 2 +- .github/workflows/resolved-issue-locking.yml | 2 +- .github/workflows/validate-branch-name.yml | 2 +- .github/workflows/validate-changelog.yml | 2 +- .../workflows/validate-commit-messages.yml | 2 +- .../decision/001-multi-loader-architecture.md | 2 +- ...ule.md => 003-the-platform-api-modules.md} | 13 +-- gradle.properties | 2 +- ...latformApi.java => RefinedStorageApi.java} | 29 +++--- ...Proxy.java => RefinedStorageApiProxy.java} | 65 +++++-------- .../common/api/RefinedStoragePlugin.java | 5 +- .../api/security/BuiltinPermissions.java | 14 --- .../AbstractStorageContainerBlockItem.java | 4 +- .../storage/AbstractStorageContainerItem.java | 6 +- .../api/storage/SerializableStorage.java | 4 +- .../energy/AbstractNetworkEnergyItem.java | 6 +- ...stractNetworkNodeContainerBlockEntity.java | 75 ++++----------- .../api/support/network/AmountOverride.java | 4 +- ...tionLogic.java => ConnectionStrategy.java} | 10 +- .../network/InWorldNetworkNodeContainer.java | 16 +++- .../NetworkNodeContainerBlockEntity.java | 19 ---- .../network/NetworkNodeContainerProvider.java | 35 +++++++ .../slotreference/SlotReferenceFactory.java | 6 +- .../common/AbstractClientModInitializer.java | 16 ++-- .../common/AbstractModInitializer.java | 90 +++++++++--------- .../refinedstorage/common/Platform.java | 7 ++ .../refinedstorage/common/PlatformProxy.java | 17 ++++ ...piImpl.java => RefinedStorageApiImpl.java} | 63 ++++++------- .../ConstructorBlockEntity.java | 15 +-- .../DestructorBlockEntity.java | 14 +-- .../controller/ControllerBlockEntity.java | 12 +-- .../controller/ControllerBlockItem.java | 14 ++- .../ControllerItemPropertyFunction.java | 4 +- .../common/detector/DetectorBlockEntity.java | 53 ++++------- .../detector/DetectorConnectionStrategy.java | 44 +++++++++ .../common/exporter/ExporterBlockEntity.java | 18 ++-- .../common/grid/AbstractGridBlockEntity.java | 29 +++--- .../grid/AbstractGridContainerMenu.java | 20 ++-- .../common/grid/CraftingGridBlockEntity.java | 4 +- .../common/grid/SecuredGridOperations.java | 6 +- .../common/grid/WirelessGridItem.java | 10 +- .../grid/screen/AbstractGridScreen.java | 6 +- .../iface/ExportedResourcesContainer.java | 6 +- .../common/iface/InterfaceBlockEntity.java | 14 +-- .../common/importer/ImporterBlockEntity.java | 28 +++--- .../NetworkReceiverBlockEntity.java | 24 +++-- .../NetworkTransmitterBlockEntity.java | 44 +++++---- .../common/networking/RelayBlockEntity.java | 70 ++++++++------ ...java => RelayInputConnectionStrategy.java} | 8 +- ...ava => RelayOutputConnectionStrategy.java} | 8 +- ...tractSecurityCardExtendedMenuProvider.java | 8 +- .../security/AbstractSecurityCardItem.java | 10 +- .../common/security/BuiltinPermission.java | 10 -- .../common/security/SecurityCardData.java | 4 +- .../security/SecurityCardPermissions.java | 6 +- .../security/SecurityManagerBlockEntity.java | 57 ++++++------ .../SecurityManagerConnectionStrategy.java | 34 +++++++ .../AbstractDiskContainerBlockEntity.java | 25 +++-- .../StorageContainerItemHelperImpl.java | 4 +- .../AbstractDiskDriveBlockEntity.java | 6 +- .../diskdrive/DiskDriveContainerMenu.java | 6 +- .../AbstractDiskInterfaceBlockEntity.java | 30 +++--- .../DiskInterfaceContainerMenu.java | 4 +- .../ExternalStorageBlockEntity.java | 19 ++-- .../AbstractPortableGridBlockEntity.java | 4 +- .../portablegrid/PortableGridBlockItem.java | 12 +-- .../AbstractStorageBlockBlockEntity.java | 22 ++--- .../FluidStorageBlockBlockEntity.java | 4 +- .../FluidStorageBlockBlockItem.java | 11 ++- .../FluidStorageBlockContainerMenu.java | 4 +- .../ItemStorageBlockBlockEntity.java | 4 +- .../ItemStorageBlockBlockItem.java | 12 ++- .../ItemStorageBlockContainerMenu.java | 4 +- .../StorageBlockLootItemFunction.java | 4 +- .../storagedisk/FluidStorageDiskItem.java | 4 +- .../storagedisk/ItemStorageDiskItem.java | 4 +- .../StorageMonitorBlockEntity.java | 20 ++-- .../StorageMonitorBlockEntityRenderer.java | 4 +- .../common/support/AbstractBaseBlock.java | 30 +++--- .../common/support/AbstractBaseScreen.java | 8 +- .../support/AbstractDirectionalBlock.java | 8 ++ .../common/support/CableBlockSupport.java | 27 ++++-- .../common/support/NetworkNodeBlockItem.java | 10 +- .../AbstractSimpleFilterContainerMenu.java | 4 +- .../NetworkNodeMenuProvider.java | 12 ++- .../support/containermenu/ResourceSlot.java | 4 +- .../support/energy/EnergyItemHelperImpl.java | 14 +-- .../energy/EnergyLootItemFunction.java | 4 +- ...actingNetworkNodeContainerBlockEntity.java | 4 +- ...deableNetworkNodeContainerBlockEntity.java | 4 +- .../BaseNetworkNodeContainerBlockEntity.java | 92 ++++--------------- .../network/ColoredConnectionStrategy.java | 70 ++++++++++++++ .../network/ConnectionProviderImpl.java | 41 +++------ .../InWorldNetworkNodeContainerBuilder.java | 63 +++++++++++++ .../InWorldNetworkNodeContainerImpl.java | 12 +-- .../NetworkNodeContainerProviderImpl.java | 32 +++++++ .../network/SimpleConnectionStrategy.java | 28 ++++++ .../c2s/SecurityCardPermissionPacket.java | 4 +- .../SecurityCardResetPermissionPacket.java | 5 +- .../packet/c2s/StorageInfoRequestPacket.java | 4 +- .../packet/s2c/StorageInfoResponsePacket.java | 4 +- .../support/resource/ResourceCodecs.java | 10 +- .../resource/ResourceContainerImpl.java | 6 +- .../tooltip/MouseClientTooltipComponent.java | 5 +- .../ResourceClientTooltipComponent.java | 6 +- .../common/upgrade/RegulatorUpgradeItem.java | 4 +- .../common/upgrade/SimpleUpgradeItem.java | 8 +- .../WirelessTransmitterBlockEntity.java | 37 +++----- ...WirelessTransmitterConnectionStrategy.java | 36 ++++++++ .../WirelessTransmitterContainerMenu.java | 4 +- ...relessTransmitterNetworkNodeContainer.java | 5 +- .../refinedstorage/api/core/NullableType.java | 13 +++ .../fabric/ModInitializerImpl.java | 36 ++++---- .../refinedstorage/fabric/PlatformImpl.java | 44 ++++++++- ...torageExporterTransferStrategyFactory.java | 2 +- ...torageImporterTransferStrategyFactory.java | 2 +- ...NetworkNodeBreakSecurityEventListener.java | 16 ++-- .../diskdrive/DiskDriveUnbakedModel.java | 8 +- .../DiskInterfaceUnbakedModel.java | 8 +- .../PortableGridUnbakedModel.java | 6 +- refinedstorage-neoforge-api/build.gradle.kts | 16 ++++ .../api/ProxyRefinedStorageNeoForgeApi.java | 32 +++++++ .../api/RefinedStorageNeoForgeApi.java | 15 +++ .../neoforge/api/package-info.java | 7 ++ refinedstorage-neoforge/build.gradle.kts | 1 + .../neoforge/ModInitializer.java | 88 ++++++++++++++---- .../refinedstorage/neoforge/PlatformImpl.java | 48 ++++++++++ .../RefinedStorageNeoForgeApiImpl.java | 24 +++++ ...andlerExporterTransferStrategyFactory.java | 2 +- ...andlerExporterTransferStrategyFactory.java | 2 +- .../strategy/ItemGridExtractionStrategy.java | 2 +- .../strategy/ItemGridInsertionStrategy.java | 2 +- .../strategy/ItemGridScrollingStrategy.java | 2 +- ...andlerImporterTransferStrategyFactory.java | 2 +- ...andlerImporterTransferStrategyFactory.java | 2 +- .../diskdrive/DiskDriveUnbakedGeometry.java | 4 +- .../DiskInterfaceUnbakedGeometry.java | 4 +- .../PortableGridUnbakedGeometry.java | 4 +- .../support/render/DiskModelBaker.java | 4 +- .../refinedstorage/common/GameTestUtil.java | 2 +- settings.gradle.kts | 1 + 145 files changed, 1424 insertions(+), 920 deletions(-) rename doc/architecture/decision/{003-the-platform-api-module.md => 003-the-platform-api-modules.md} (57%) rename refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/{PlatformApi.java => RefinedStorageApi.java} (88%) rename refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/{PlatformApiProxy.java => RefinedStorageApiProxy.java} (88%) delete mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/BuiltinPermissions.java rename refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/{ConnectionLogic.java => ConnectionStrategy.java} (79%) delete mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/NetworkNodeContainerBlockEntity.java create mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/NetworkNodeContainerProvider.java rename refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/{PlatformApiImpl.java => RefinedStorageApiImpl.java} (92%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorConnectionStrategy.java rename refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/{RelayInputNetworkNodeContainer.java => RelayInputConnectionStrategy.java} (74%) rename refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/{RelayOutputNetworkNodeContainer.java => RelayOutputConnectionStrategy.java} (75%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityManagerConnectionStrategy.java create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/ColoredConnectionStrategy.java create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/InWorldNetworkNodeContainerBuilder.java create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/NetworkNodeContainerProviderImpl.java create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/SimpleConnectionStrategy.java create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterConnectionStrategy.java create mode 100644 refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/NullableType.java create mode 100644 refinedstorage-neoforge-api/build.gradle.kts create mode 100644 refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/ProxyRefinedStorageNeoForgeApi.java create mode 100644 refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/RefinedStorageNeoForgeApi.java create mode 100644 refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/package-info.java create mode 100644 refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/RefinedStorageNeoForgeApiImpl.java diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 18b4d735d..5cb098cfa 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -265,17 +265,18 @@ Refined Storage is split up into various modules. Most modules aren't dependent the `refinedstorage-common`, `refinedstorage-neoforge` and `refinedstorage-fabric` modules have dependencies on Minecraft. -| Name | Use in addons | Description | -|-------------------------------|---------------|----------------------------------------------------------------------------------------------------| -| `refinedstorage-core-api` | ✔️ | Contains some utility classes and enums. | -| `refinedstorage-grid-api` | ✔️ | Contains Grid related functionality. | -| `refinedstorage-network-api` | ✔️ | Contains storage network related functionality. | -| `refinedstorage-network` | ❌ | Contains implementations of `refinedstorage-network-api`. | -| `refinedstorage-network-test` | ✔️ | JUnit extension which helps with setting up a network and a network node for testing. | -| `refinedstorage-query-parser` | ✔️ | A query parser, contains a lexer and parser. Only used for Grid query parsing. | -| `refinedstorage-resource-api` | ✔️ | Contains API for handling resources. | -| `refinedstorage-storage-api` | ✔️ | Contains storage related functionality. | -| `refinedstorage-common-api` | ✔️ | Implements the various Refined Storage API modules for use in Minecraft. | -| `refinedstorage-common` | ❌ | Common mod code. Most gameplay code is in here. | -| `refinedstorage-fabric` | ❌ | The platform module for Fabric. This module contains Fabric specific code. | -| `refinedstorage-neoforge` | ❌ | The platform module for Forge. This module contains Forge specific code and the integration tests. | +| Name | Use in addons | Description | +|-------------------------------|---------------|----------------------------------------------------------------------------------------------------------| +| `refinedstorage-core-api` | ✔️ | Contains some utility classes and enums. | +| `refinedstorage-grid-api` | ✔️ | Contains Grid related functionality. | +| `refinedstorage-network-api` | ✔️ | Contains storage network related functionality. | +| `refinedstorage-network` | ❌ | Contains implementations of `refinedstorage-network-api`. | +| `refinedstorage-network-test` | ✔️ | JUnit extension which helps with setting up a network and a network node for testing. | +| `refinedstorage-query-parser` | ✔️ | A query parser, contains a lexer and parser. Only used for Grid query parsing. | +| `refinedstorage-resource-api` | ✔️ | Contains API for handling resources. | +| `refinedstorage-storage-api` | ✔️ | Contains storage related functionality. | +| `refinedstorage-common-api` | ✔️ | Implements the various Refined Storage API modules for use in Minecraft. | +| `refinedstorage-common` | ❌ | Common mod code. Most gameplay code is in here. | +| `refinedstorage-fabric` | ❌ | The platform module for Fabric. This module contains Fabric specific code. | +| `refinedstorage-neoforge-api` | ✔️ | Additional API for the NeoForge platform. | +| `refinedstorage-neoforge` | ❌ | The platform module for NeoForge. This module contains NeoForge specific code and the integration tests. | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ff6d7325..8ec5d03bc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: types: [ opened, synchronize, reopened ] jobs: build: - uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.16.7 + uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.16.8 with: gametests: true secrets: inherit diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 31fd1369c..f005243f6 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -17,7 +17,7 @@ on: type: string jobs: draft: - uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.16.7 + uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.16.8 with: release-type: ${{ inputs.release-type }} version-number-override: ${{ inputs.version-number-override }} diff --git a/.github/workflows/issue-for-unsupported-version.yml b/.github/workflows/issue-for-unsupported-version.yml index 59ca50f9a..2a5a4a1fb 100644 --- a/.github/workflows/issue-for-unsupported-version.yml +++ b/.github/workflows/issue-for-unsupported-version.yml @@ -4,4 +4,4 @@ on: types: [ labeled, unlabeled, reopened ] jobs: unsupported-labeler: - uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.16.7 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.16.8 \ No newline at end of file diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index b7a90b1a8..477396909 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -7,7 +7,7 @@ on: - closed jobs: publish-release: - uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.16.7 + uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.16.8 secrets: inherit with: project-name: 'Refined Storage' diff --git a/.github/workflows/resolved-issue-locking.yml b/.github/workflows/resolved-issue-locking.yml index 53d3f9bbf..bdaa9235a 100644 --- a/.github/workflows/resolved-issue-locking.yml +++ b/.github/workflows/resolved-issue-locking.yml @@ -4,4 +4,4 @@ on: - cron: '0 0 * * 1' jobs: lock: - uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.16.7 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.16.8 \ No newline at end of file diff --git a/.github/workflows/validate-branch-name.yml b/.github/workflows/validate-branch-name.yml index b13799f7b..52bbc124c 100644 --- a/.github/workflows/validate-branch-name.yml +++ b/.github/workflows/validate-branch-name.yml @@ -2,4 +2,4 @@ name: Validate branch name on: [ pull_request ] jobs: validate-branch-name: - uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.16.7 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.16.8 \ No newline at end of file diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml index 47db6c5ec..441ebdf51 100644 --- a/.github/workflows/validate-changelog.yml +++ b/.github/workflows/validate-changelog.yml @@ -4,4 +4,4 @@ on: types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ] jobs: validate-changelog: - uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.16.7 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.16.8 \ No newline at end of file diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml index ea9f66ebd..e15ae8c6d 100644 --- a/.github/workflows/validate-commit-messages.yml +++ b/.github/workflows/validate-commit-messages.yml @@ -2,4 +2,4 @@ name: Validate commit messages on: [ pull_request ] jobs: validate-commit-messages: - uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.16.7 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.16.8 \ No newline at end of file diff --git a/doc/architecture/decision/001-multi-loader-architecture.md b/doc/architecture/decision/001-multi-loader-architecture.md index 3421d5161..5f38b13d4 100644 --- a/doc/architecture/decision/001-multi-loader-architecture.md +++ b/doc/architecture/decision/001-multi-loader-architecture.md @@ -19,7 +19,7 @@ There will be a common module, and most code should reside in there. The modload reserved for platform specific functionality, like registration, networking, etc. -The module naming follows the standard of `refinedstorage-{name}`. +The module naming follows the standard of `refinedstorage-{modloader-name}`. ## Consequences diff --git a/doc/architecture/decision/003-the-platform-api-module.md b/doc/architecture/decision/003-the-platform-api-modules.md similarity index 57% rename from doc/architecture/decision/003-the-platform-api-module.md rename to doc/architecture/decision/003-the-platform-api-modules.md index ac72d0963..77c2bfb87 100644 --- a/doc/architecture/decision/003-the-platform-api-module.md +++ b/doc/architecture/decision/003-the-platform-api-modules.md @@ -1,4 +1,4 @@ -# 3. The platform API module +# 3. The platform API modules Date: 2021-12-29 @@ -17,18 +17,13 @@ Refined Storage 1). ## Decision Refined Storage will have a modloader-neutral (just like the common module) platform API module which addon mods can use -to integrate with Refined Storage. +to integrate with Refined Storage: `refinedstorage-common-api`. -Moreover, Refined Storage itself will use this platform API module. The module is named `refinedstorage-common-api`. +For modloader specific integrations, we'll have a `refinedstorage-{modloader-name}-api` module. ## Consequences -By offering a dedicated platform API module we can much more tightly control API surface. - -The platform API module is platform-neutral so addons can decide what modloader they target. Moreover, it saves us time -because we don't have to maintain different platform APIs per modloader. - -However, if addon mods want to support multiple modloaders, they'll have to create their own abstractions. +By offering dedicated platform API modules we can much more tightly control API surface. ## References diff --git a/gradle.properties b/gradle.properties index d6f86a39a..bd3791e6f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -refinedarchitectVersion=0.16.7 +refinedarchitectVersion=0.16.8 # Gradle org.gradle.jvmargs=-Xmx1G diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/PlatformApi.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStorageApi.java similarity index 88% rename from refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/PlatformApi.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStorageApi.java index 4ba3c3259..4afc37e7b 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/PlatformApi.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStorageApi.java @@ -21,7 +21,6 @@ import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategy; import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategyFactory; import com.refinedmods.refinedstorage.common.api.importer.ImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.common.api.security.BuiltinPermissions; import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; import com.refinedmods.refinedstorage.common.api.storage.StorageContainerItemHelper; import com.refinedmods.refinedstorage.common.api.storage.StorageRepository; @@ -30,8 +29,8 @@ import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorExtractionStrategy; import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorInsertionStrategy; import com.refinedmods.refinedstorage.common.api.support.energy.EnergyItemHelper; -import com.refinedmods.refinedstorage.common.api.support.network.ConnectionLogic; import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemHelper; import com.refinedmods.refinedstorage.common.api.support.registry.PlatformRegistry; import com.refinedmods.refinedstorage.common.api.support.resource.RecipeModIngredientConverter; @@ -48,7 +47,6 @@ import java.util.Collection; import java.util.Optional; import java.util.Set; -import java.util.function.Supplier; import javax.annotation.Nullable; import net.minecraft.core.BlockPos; @@ -66,8 +64,8 @@ import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") -public interface PlatformApi { - PlatformApi INSTANCE = new PlatformApiProxy(); +public interface RefinedStorageApi { + RefinedStorageApi INSTANCE = new RefinedStorageApiProxy(); PlatformRegistry getStorageTypeRegistry(); @@ -109,20 +107,17 @@ public interface PlatformApi { UpgradeRegistry getUpgradeRegistry(); - InWorldNetworkNodeContainer createInWorldNetworkNodeContainer(BlockEntity blockEntity, - NetworkNode node, - String name, - int priority, - ConnectionLogic connectionLogic, - @Nullable Supplier keyProvider); + NetworkNodeContainerProvider createNetworkNodeContainerProvider(); - void onNetworkNodeContainerInitialized(InWorldNetworkNodeContainer container, - @Nullable Level level, - @Nullable Runnable callback); + InWorldNetworkNodeContainer.Builder createNetworkNodeContainer(BlockEntity blockEntity, NetworkNode networkNode); - void onNetworkNodeContainerRemoved(InWorldNetworkNodeContainer container, @Nullable Level level); + void initializeNetworkNodeContainer(InWorldNetworkNodeContainer container, + @Nullable Level level, + @Nullable Runnable callback); - void onNetworkNodeContainerUpdated(InWorldNetworkNodeContainer container, @Nullable Level level); + void removeNetworkNodeContainer(InWorldNetworkNodeContainer container, @Nullable Level level); + + void updateNetworkNodeContainer(InWorldNetworkNodeContainer container, @Nullable Level level); GridInsertionStrategy createGridInsertionStrategy(AbstractContainerMenu containerMenu, ServerPlayer player, @@ -196,8 +191,6 @@ EnergyStorage asBlockItemEnergyStorage( void useSlotReferencedItem(Player player, Item... items); - BuiltinPermissions getBuiltinPermissions(); - PlatformRegistry getPermissionRegistry(); SecurityPolicy createDefaultSecurityPolicy(); diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/PlatformApiProxy.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStorageApiProxy.java similarity index 88% rename from refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/PlatformApiProxy.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStorageApiProxy.java index a7764ee2c..9f9553678 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/PlatformApiProxy.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStorageApiProxy.java @@ -21,7 +21,6 @@ import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategy; import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategyFactory; import com.refinedmods.refinedstorage.common.api.importer.ImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.common.api.security.BuiltinPermissions; import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; import com.refinedmods.refinedstorage.common.api.storage.StorageContainerItemHelper; import com.refinedmods.refinedstorage.common.api.storage.StorageRepository; @@ -30,8 +29,8 @@ import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorExtractionStrategy; import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorInsertionStrategy; import com.refinedmods.refinedstorage.common.api.support.energy.EnergyItemHelper; -import com.refinedmods.refinedstorage.common.api.support.network.ConnectionLogic; import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemHelper; import com.refinedmods.refinedstorage.common.api.support.registry.PlatformRegistry; import com.refinedmods.refinedstorage.common.api.support.resource.RecipeModIngredientConverter; @@ -48,7 +47,6 @@ import java.util.Collection; import java.util.Optional; import java.util.Set; -import java.util.function.Supplier; import javax.annotation.Nullable; import net.minecraft.core.BlockPos; @@ -64,13 +62,13 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -public class PlatformApiProxy implements PlatformApi { +public class RefinedStorageApiProxy implements RefinedStorageApi { @Nullable - private PlatformApi delegate; + private RefinedStorageApi delegate; - public void setDelegate(final PlatformApi delegate) { + public void setDelegate(final RefinedStorageApi delegate) { if (this.delegate != null) { - throw new IllegalStateException("Platform API already injected"); + throw new IllegalStateException("API already injected"); } this.delegate = delegate; } @@ -176,41 +174,33 @@ public UpgradeRegistry getUpgradeRegistry() { } @Override - public InWorldNetworkNodeContainer createInWorldNetworkNodeContainer( - final BlockEntity blockEntity, - final NetworkNode node, - final String name, - final int priority, - final ConnectionLogic connectionLogic, - @Nullable final Supplier keyProvider - ) { - return ensureLoaded().createInWorldNetworkNodeContainer( - blockEntity, - node, - name, - priority, - connectionLogic, - keyProvider - ); + public NetworkNodeContainerProvider createNetworkNodeContainerProvider() { + return ensureLoaded().createNetworkNodeContainerProvider(); } @Override - public void onNetworkNodeContainerInitialized(final InWorldNetworkNodeContainer container, - @Nullable final Level level, - @Nullable final Runnable callback) { - ensureLoaded().onNetworkNodeContainerInitialized(container, level, callback); + public InWorldNetworkNodeContainer.Builder createNetworkNodeContainer(final BlockEntity blockEntity, + final NetworkNode networkNode) { + return ensureLoaded().createNetworkNodeContainer(blockEntity, networkNode); } @Override - public void onNetworkNodeContainerRemoved(final InWorldNetworkNodeContainer container, - @Nullable final Level level) { - ensureLoaded().onNetworkNodeContainerRemoved(container, level); + public void initializeNetworkNodeContainer(final InWorldNetworkNodeContainer container, + @Nullable final Level level, + @Nullable final Runnable callback) { + ensureLoaded().initializeNetworkNodeContainer(container, level, callback); } @Override - public void onNetworkNodeContainerUpdated(final InWorldNetworkNodeContainer container, - @Nullable final Level level) { - ensureLoaded().onNetworkNodeContainerUpdated(container, level); + public void removeNetworkNodeContainer(final InWorldNetworkNodeContainer container, + @Nullable final Level level) { + ensureLoaded().removeNetworkNodeContainer(container, level); + } + + @Override + public void updateNetworkNodeContainer(final InWorldNetworkNodeContainer container, + @Nullable final Level level) { + ensureLoaded().updateNetworkNodeContainer(container, level); } @Override @@ -377,11 +367,6 @@ public void useSlotReferencedItem(final Player player, final Item... items) { ensureLoaded().useSlotReferencedItem(player, items); } - @Override - public BuiltinPermissions getBuiltinPermissions() { - return ensureLoaded().getBuiltinPermissions(); - } - @Override public PlatformRegistry getPermissionRegistry() { return ensureLoaded().getPermissionRegistry(); @@ -410,9 +395,9 @@ public boolean canPlaceNetworkNode(final ServerPlayer player, return ensureLoaded().canPlaceNetworkNode(player, level, pos, state); } - private PlatformApi ensureLoaded() { + private RefinedStorageApi ensureLoaded() { if (delegate == null) { - throw new IllegalStateException("Platform API not loaded yet"); + throw new IllegalStateException("API not loaded yet"); } return delegate; } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStoragePlugin.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStoragePlugin.java index 36a761ec8..2deb79c30 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStoragePlugin.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStoragePlugin.java @@ -2,7 +2,10 @@ import org.apiguardian.api.API; +// TODO: Introduce NetworkNodeContainerProvider +// TODO: Use platform to get access to NetworkNodeProvider instead of instanceof checks. +// TODO: Rename to RS entrypoint and move to fabric-api. @API(status = API.Status.STABLE, since = "2.0.0-milestone.3.13") public interface RefinedStoragePlugin { - void onPlatformApiAvailable(PlatformApi platformApi); + void onApiAvailable(RefinedStorageApi api); } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/BuiltinPermissions.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/BuiltinPermissions.java deleted file mode 100644 index a936ac77d..000000000 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/security/BuiltinPermissions.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.refinedmods.refinedstorage.common.api.security; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.5") -public record BuiltinPermissions( - PlatformPermission insert, - PlatformPermission extract, - PlatformPermission autocrafting, - PlatformPermission modify, - PlatformPermission build, - PlatformPermission security -) { -} diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/AbstractStorageContainerBlockItem.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/AbstractStorageContainerBlockItem.java index 9200098c3..b913b0651 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/AbstractStorageContainerBlockItem.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/AbstractStorageContainerBlockItem.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.api.storage; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import java.util.List; import javax.annotation.Nullable; @@ -75,7 +75,7 @@ public void appendHoverText(final ItemStack stack, final List tooltip, final TooltipFlag flag) { super.appendHoverText(stack, context, tooltip, flag); - final StorageRepository storageRepository = PlatformApi.INSTANCE.getClientStorageRepository(); + final StorageRepository storageRepository = RefinedStorageApi.INSTANCE.getClientStorageRepository(); helper.appendToTooltip(stack, storageRepository, tooltip, flag, this::formatAmount, hasCapacity()); } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/AbstractStorageContainerItem.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/AbstractStorageContainerItem.java index 9a0a7fd39..e1a45b760 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/AbstractStorageContainerItem.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/AbstractStorageContainerItem.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.api.storage; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import java.util.List; import java.util.Optional; @@ -52,7 +52,7 @@ public void inventoryTick(final ItemStack stack, final boolean selected) { super.inventoryTick(stack, level, entity, slot, selected); if (!level.isClientSide() && !helper.hasStorage(stack) && entity instanceof Player) { - final StorageRepository storageRepository = PlatformApi.INSTANCE.getStorageRepository(level); + final StorageRepository storageRepository = RefinedStorageApi.INSTANCE.getStorageRepository(level); helper.setStorage(storageRepository, stack, createStorage(storageRepository)); } } @@ -63,7 +63,7 @@ public void appendHoverText(final ItemStack stack, final List tooltip, final TooltipFlag flag) { super.appendHoverText(stack, context, tooltip, flag); - final StorageRepository storageRepository = PlatformApi.INSTANCE.getClientStorageRepository(); + final StorageRepository storageRepository = RefinedStorageApi.INSTANCE.getClientStorageRepository(); helper.appendToTooltip(stack, storageRepository, tooltip, flag, this::formatAmount, hasCapacity()); } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/SerializableStorage.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/SerializableStorage.java index fba0e2057..841e721e8 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/SerializableStorage.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/storage/SerializableStorage.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.common.api.storage; import com.refinedmods.refinedstorage.api.storage.Storage; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.mojang.serialization.Codec; import org.apiguardian.api.API; @@ -11,7 +11,7 @@ public interface SerializableStorage extends Storage { StorageType getType(); static Codec getCodec(final Runnable listener) { - return PlatformApi.INSTANCE.getStorageTypeRegistry() + return RefinedStorageApi.INSTANCE.getStorageTypeRegistry() .codec() .dispatch(SerializableStorage::getType, storage -> storage.getMapCodec(listener)); } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractNetworkEnergyItem.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractNetworkEnergyItem.java index ea0a9a2f1..f9646e79d 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractNetworkEnergyItem.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/energy/AbstractNetworkEnergyItem.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.api.support.energy; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemContext; import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemHelper; import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; @@ -56,7 +56,7 @@ public void appendHoverText(final ItemStack stack, public InteractionResultHolder use(final Level level, final Player player, final InteractionHand hand) { final ItemStack stack = player.getItemInHand(hand); if (player instanceof ServerPlayer serverPlayer && level.getServer() != null) { - final SlotReference slotReference = PlatformApi.INSTANCE.createInventorySlotReference(player, hand); + final SlotReference slotReference = RefinedStorageApi.INSTANCE.createInventorySlotReference(player, hand); slotReference.resolve(player).ifPresent(s -> use(serverPlayer, s, slotReference)); } return InteractionResultHolder.consume(stack); @@ -64,7 +64,7 @@ public InteractionResultHolder use(final Level level, final Player pl @Override public void use(final ServerPlayer player, final ItemStack stack, final SlotReference slotReference) { - final NetworkItemContext context = PlatformApi.INSTANCE.getNetworkItemHelper().createContext( + final NetworkItemContext context = RefinedStorageApi.INSTANCE.getNetworkItemHelper().createContext( stack, player, slotReference diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/AbstractNetworkNodeContainerBlockEntity.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/AbstractNetworkNodeContainerBlockEntity.java index 309b9c3b5..a98eec24a 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/AbstractNetworkNodeContainerBlockEntity.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/AbstractNetworkNodeContainerBlockEntity.java @@ -1,91 +1,54 @@ package com.refinedmods.refinedstorage.common.api.support.network; import com.refinedmods.refinedstorage.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage.common.api.PlatformApi; - -import java.util.HashSet; -import java.util.Set; -import javax.annotation.Nullable; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.1.2") -public abstract class AbstractNetworkNodeContainerBlockEntity extends BlockEntity - implements NetworkNodeContainerBlockEntity, ConnectionLogic { - protected static final String MAIN_CONTAINER_NAME = "main"; - - protected final T mainNode; - protected final InWorldNetworkNodeContainer mainContainer; - - @Nullable - protected Runnable initializationCallback; - - private final Set containers = new HashSet<>(); +public abstract class AbstractNetworkNodeContainerBlockEntity extends BlockEntity { + protected final T mainNetworkNode; + protected final NetworkNodeContainerProvider containers; protected AbstractNetworkNodeContainerBlockEntity(final BlockEntityType type, final BlockPos pos, final BlockState state, - final T mainNode) { + final T mainNetworkNode) { super(type, pos, state); - this.mainContainer = createMainContainer(mainNode); - addContainer(mainContainer); - this.mainNode = mainNode; + this.containers = createContainerProvider(); + this.containers.addContainer(createMainContainer(mainNetworkNode)); + this.mainNetworkNode = mainNetworkNode; } - protected InWorldNetworkNodeContainer createMainContainer(final T node) { - return PlatformApi.INSTANCE.createInWorldNetworkNodeContainer( - this, - node, - MAIN_CONTAINER_NAME, - 0, - this, - null - ); + protected NetworkNodeContainerProvider createContainerProvider() { + return RefinedStorageApi.INSTANCE.createNetworkNodeContainerProvider(); } - protected final void addContainer(final InWorldNetworkNodeContainer container) { - containers.add(container); - } - - protected final void updateContainers() { - containers.forEach(container -> PlatformApi.INSTANCE.onNetworkNodeContainerUpdated(container, level)); - } - - @Override - public void addOutgoingConnections(final ConnectionSink sink) { - for (final Direction direction : Direction.values()) { - sink.tryConnectInSameDimension(worldPosition.relative(direction), direction.getOpposite()); - } - } - - @Override - public boolean canAcceptIncomingConnection(final Direction incomingDirection, final BlockState connectingState) { - return true; + protected InWorldNetworkNodeContainer createMainContainer(final T networkNode) { + return RefinedStorageApi.INSTANCE.createNetworkNodeContainer(this, networkNode).build(); } @Override public void clearRemoved() { super.clearRemoved(); - containers.forEach(container -> PlatformApi.INSTANCE.onNetworkNodeContainerInitialized( - container, - level, - initializationCallback - )); + containers.initialize(level, this::containerInitialized); + } + + protected void containerInitialized() { + // no op } @Override public void setRemoved() { super.setRemoved(); - containers.forEach(container -> PlatformApi.INSTANCE.onNetworkNodeContainerRemoved(container, level)); + containers.remove(level); } - @Override - public Set getContainers() { + public final NetworkNodeContainerProvider getContainerProvider() { return containers; } } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/AmountOverride.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/AmountOverride.java index 7a4ffb7de..2a4dc9030 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/AmountOverride.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/AmountOverride.java @@ -15,9 +15,9 @@ public interface AmountOverride { * Modifies the requested amount to a new amount. * * @param resource the resource - * @param desiredAmount the original requested amount + * @param amount the original requested amount * @param currentAmountSupplier the current amount present in the source * @return the new requested amount, may be 0 */ - long overrideAmount(ResourceKey resource, long desiredAmount, LongSupplier currentAmountSupplier); + long overrideAmount(ResourceKey resource, long amount, LongSupplier currentAmountSupplier); } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/ConnectionLogic.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/ConnectionStrategy.java similarity index 79% rename from refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/ConnectionLogic.java rename to refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/ConnectionStrategy.java index 167263c91..8b92520c1 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/ConnectionLogic.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/ConnectionStrategy.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.api.support.network; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import net.minecraft.core.Direction; import net.minecraft.world.level.Level; @@ -8,13 +8,12 @@ import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.3.6") -public interface ConnectionLogic { +public interface ConnectionStrategy { /** * Add outgoing connections here. * Called when a node is about to be added into the network graph. * If the outgoing connections ever change, call {@link - * PlatformApi#onNetworkNodeContainerUpdated( - *InWorldNetworkNodeContainer, Level)}. + * RefinedStorageApi#updateNetworkNodeContainer(InWorldNetworkNodeContainer, Level)}. * * @param sink the sink that accepts outgoing connections */ @@ -24,8 +23,7 @@ public interface ConnectionLogic { * Returns whether the (not yet discovered) node can accept an incoming connection. * Changes to this return value won't cause a rebuild of the network state. * If the return value ever changes, call {@link - * PlatformApi#onNetworkNodeContainerUpdated( - *InWorldNetworkNodeContainer, Level)}. + * RefinedStorageApi#updateNetworkNodeContainer(InWorldNetworkNodeContainer, Level)}. * * @param incomingDirection the incoming direction * @param connectingState the state wanting to connect diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/InWorldNetworkNodeContainer.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/InWorldNetworkNodeContainer.java index 016826098..de9fb8763 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/InWorldNetworkNodeContainer.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/InWorldNetworkNodeContainer.java @@ -2,13 +2,15 @@ import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; +import java.util.function.Supplier; + import net.minecraft.core.BlockPos; import net.minecraft.core.GlobalPos; import net.minecraft.world.level.block.state.BlockState; import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.2.1") -public interface InWorldNetworkNodeContainer extends NetworkNodeContainer, ConnectionLogic { +public interface InWorldNetworkNodeContainer extends NetworkNodeContainer, ConnectionStrategy { BlockState getBlockState(); boolean isRemoved(); @@ -18,4 +20,16 @@ public interface InWorldNetworkNodeContainer extends NetworkNodeContainer, Conne BlockPos getLocalPosition(); String getName(); + + interface Builder { + Builder name(String name); + + Builder priority(int priority); + + Builder connectionStrategy(ConnectionStrategy connectionStrategy); + + Builder keyProvider(Supplier keyProvider); + + InWorldNetworkNodeContainer build(); + } } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/NetworkNodeContainerBlockEntity.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/NetworkNodeContainerBlockEntity.java deleted file mode 100644 index 7d481cf00..000000000 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/NetworkNodeContainerBlockEntity.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.refinedmods.refinedstorage.common.api.support.network; - -import com.refinedmods.refinedstorage.common.api.PlatformApi; -import com.refinedmods.refinedstorage.common.api.security.SecurityHelper; - -import java.util.Set; - -import net.minecraft.server.level.ServerPlayer; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.6") -@FunctionalInterface -public interface NetworkNodeContainerBlockEntity { - Set getContainers(); - - default boolean canBuild(final ServerPlayer player) { - return SecurityHelper.isAllowed(player, PlatformApi.INSTANCE.getBuiltinPermissions().build(), getContainers()); - } -} diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/NetworkNodeContainerProvider.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/NetworkNodeContainerProvider.java new file mode 100644 index 000000000..d718ed8d6 --- /dev/null +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/network/NetworkNodeContainerProvider.java @@ -0,0 +1,35 @@ +package com.refinedmods.refinedstorage.common.api.support.network; + +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; + +import java.util.Set; +import javax.annotation.Nullable; + +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.level.Level; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.6") +public interface NetworkNodeContainerProvider { + Set getContainers(); + + void addContainer(InWorldNetworkNodeContainer container); + + boolean canBuild(ServerPlayer player); + + default void update(@Nullable final Level level) { + getContainers().forEach(container -> RefinedStorageApi.INSTANCE.updateNetworkNodeContainer(container, level)); + } + + default void initialize(@Nullable final Level level, @Nullable final Runnable callback) { + getContainers().forEach(container -> RefinedStorageApi.INSTANCE.initializeNetworkNodeContainer( + container, + level, + callback + )); + } + + default void remove(@Nullable final Level level) { + getContainers().forEach(container -> RefinedStorageApi.INSTANCE.removeNetworkNodeContainer(container, level)); + } +} diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceFactory.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceFactory.java index ed1cb6416..61f6440db 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceFactory.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/slotreference/SlotReferenceFactory.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.api.support.slotreference; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; @@ -12,7 +12,7 @@ public interface SlotReferenceFactory { StreamCodec STREAM_CODEC = StreamCodec.of( (buf, slotReference) -> { - final ResourceLocation factoryId = PlatformApi.INSTANCE.getSlotReferenceFactoryRegistry() + final ResourceLocation factoryId = RefinedStorageApi.INSTANCE.getSlotReferenceFactoryRegistry() .getId(slotReference.getFactory()) .orElseThrow(); buf.writeResourceLocation(factoryId); @@ -20,7 +20,7 @@ public interface SlotReferenceFactory { }, buf -> { final ResourceLocation factoryId = buf.readResourceLocation(); - final SlotReferenceFactory factory = PlatformApi.INSTANCE.getSlotReferenceFactoryRegistry() + final SlotReferenceFactory factory = RefinedStorageApi.INSTANCE.getSlotReferenceFactoryRegistry() .get(factoryId) .orElseThrow(); return factory.getStreamCodec().decode(buf); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractClientModInitializer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractClientModInitializer.java index 9f7836eb1..b7a8be0fe 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractClientModInitializer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractClientModInitializer.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.constructordestructor.ConstructorScreen; import com.refinedmods.refinedstorage.common.constructordestructor.DestructorScreen; import com.refinedmods.refinedstorage.common.content.Items; @@ -80,12 +80,12 @@ protected static void registerScreens(final ScreenRegistration registration) { } protected static void registerAlternativeGridHints() { - PlatformApi.INSTANCE.addAlternativeGridInsertionHint(new FluidGridInsertionHint()); + RefinedStorageApi.INSTANCE.addAlternativeGridInsertionHint(new FluidGridInsertionHint()); } protected static void registerResourceRendering() { - PlatformApi.INSTANCE.registerResourceRendering(ItemResource.class, new ItemResourceRendering()); - PlatformApi.INSTANCE.registerResourceRendering(FluidResource.class, new FluidResourceRendering()); + RefinedStorageApi.INSTANCE.registerResourceRendering(ItemResource.class, new ItemResourceRendering()); + RefinedStorageApi.INSTANCE.registerResourceRendering(FluidResource.class, new FluidResourceRendering()); } protected static void handleInputEvents() { @@ -95,7 +95,7 @@ protected static void handleInputEvents() { } final KeyMapping openWirelessGrid = KeyMappings.INSTANCE.getOpenWirelessGrid(); while (openWirelessGrid != null && openWirelessGrid.consumeClick()) { - PlatformApi.INSTANCE.useSlotReferencedItem( + RefinedStorageApi.INSTANCE.useSlotReferencedItem( player, Items.INSTANCE.getWirelessGrid(), Items.INSTANCE.getCreativeWirelessGrid() @@ -103,7 +103,7 @@ protected static void handleInputEvents() { } final KeyMapping openPortableGrid = KeyMappings.INSTANCE.getOpenPortableGrid(); while (openPortableGrid != null && openPortableGrid.consumeClick()) { - PlatformApi.INSTANCE.useSlotReferencedItem( + RefinedStorageApi.INSTANCE.useSlotReferencedItem( player, Items.INSTANCE.getPortableGrid(), Items.INSTANCE.getCreativePortableGrid() @@ -114,7 +114,7 @@ protected static void handleInputEvents() { protected static void registerDiskModels() { final ResourceLocation diskModel = createIdentifier("block/disk/disk"); for (final ItemStorageVariant variant : ItemStorageVariant.values()) { - PlatformApi.INSTANCE.getStorageContainerItemHelper().registerDiskModel( + RefinedStorageApi.INSTANCE.getStorageContainerItemHelper().registerDiskModel( Items.INSTANCE.getItemStorageDisk(variant), diskModel ); @@ -122,7 +122,7 @@ protected static void registerDiskModels() { final ResourceLocation fluidDiskModel = createIdentifier("block/disk/fluid_disk"); for (final FluidStorageVariant variant : FluidStorageVariant.values()) { - PlatformApi.INSTANCE.getStorageContainerItemHelper().registerDiskModel( + RefinedStorageApi.INSTANCE.getStorageContainerItemHelper().registerDiskModel( Items.INSTANCE.getFluidStorageDisk(variant), fluidDiskModel ); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractModInitializer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractModInitializer.java index 48f9b5db1..5780792be 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractModInitializer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractModInitializer.java @@ -8,8 +8,8 @@ import com.refinedmods.refinedstorage.api.network.node.GraphNetworkComponent; import com.refinedmods.refinedstorage.api.network.security.SecurityNetworkComponent; import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage.common.api.PlatformApi; -import com.refinedmods.refinedstorage.common.api.PlatformApiProxy; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApiProxy; import com.refinedmods.refinedstorage.common.api.security.PlatformSecurityNetworkComponent; import com.refinedmods.refinedstorage.common.api.upgrade.AbstractUpgradeItem; import com.refinedmods.refinedstorage.common.configurationcard.ConfigurationCardItem; @@ -168,7 +168,7 @@ public abstract class AbstractModInitializer { private static final String FLUID_REGISTRY_KEY = "fluid"; protected final void initializePlatformApi() { - ((PlatformApiProxy) PlatformApi.INSTANCE).setDelegate(new PlatformApiImpl()); + ((RefinedStorageApiProxy) RefinedStorageApi.INSTANCE).setDelegate(new RefinedStorageApiImpl()); registerStorageTypes(); registerResourceTypes(); registerAdditionalResourceFactories(); @@ -184,95 +184,99 @@ protected final void initializePlatformApi() { } private void registerStorageTypes() { - PlatformApi.INSTANCE.getStorageTypeRegistry().register( + RefinedStorageApi.INSTANCE.getStorageTypeRegistry().register( createIdentifier(ITEM_REGISTRY_KEY), StorageTypes.ITEM ); - PlatformApi.INSTANCE.getStorageTypeRegistry().register( + RefinedStorageApi.INSTANCE.getStorageTypeRegistry().register( createIdentifier(FLUID_REGISTRY_KEY), StorageTypes.FLUID ); } private void registerResourceTypes() { - PlatformApi.INSTANCE.getResourceTypeRegistry().register( + RefinedStorageApi.INSTANCE.getResourceTypeRegistry().register( createIdentifier(ITEM_REGISTRY_KEY), ResourceTypes.ITEM ); - PlatformApi.INSTANCE.getResourceTypeRegistry().register( + RefinedStorageApi.INSTANCE.getResourceTypeRegistry().register( createIdentifier(FLUID_REGISTRY_KEY), ResourceTypes.FLUID ); } private void registerAdditionalResourceFactories() { - PlatformApi.INSTANCE.addResourceFactory(new FluidResourceFactory()); + RefinedStorageApi.INSTANCE.addResourceFactory(new FluidResourceFactory()); } private void registerResourceContainerInsertStrategies() { - PlatformApi.INSTANCE.addResourceContainerInsertStrategy(new FluidResourceContainerInsertStrategy()); + RefinedStorageApi.INSTANCE.addResourceContainerInsertStrategy(new FluidResourceContainerInsertStrategy()); } private void registerDestructorStrategyFactories() { - PlatformApi.INSTANCE.addDestructorStrategyFactory(new BlockBreakDestructorStrategyFactory()); - PlatformApi.INSTANCE.addDestructorStrategyFactory(new FluidBreakDestructorStrategyFactory()); - PlatformApi.INSTANCE.addDestructorStrategyFactory(new ItemPickupDestructorStrategyFactory()); + RefinedStorageApi.INSTANCE.addDestructorStrategyFactory(new BlockBreakDestructorStrategyFactory()); + RefinedStorageApi.INSTANCE.addDestructorStrategyFactory(new FluidBreakDestructorStrategyFactory()); + RefinedStorageApi.INSTANCE.addDestructorStrategyFactory(new ItemPickupDestructorStrategyFactory()); } private void registerConstructorStrategyFactories() { - PlatformApi.INSTANCE.addConstructorStrategyFactory((level, pos, direction, upgradeState, dropItems) -> + RefinedStorageApi.INSTANCE.addConstructorStrategyFactory((level, pos, direction, upgradeState, dropItems) -> Optional.of(new PlaceBlockConstructorStrategy(level, pos, direction))); - PlatformApi.INSTANCE.addConstructorStrategyFactory((level, pos, direction, upgradeState, dropItems) -> + RefinedStorageApi.INSTANCE.addConstructorStrategyFactory((level, pos, direction, upgradeState, dropItems) -> Optional.of(new PlaceFireworksConstructorStrategy(level, pos, direction))); - PlatformApi.INSTANCE.addConstructorStrategyFactory((level, pos, direction, upgradeState, dropItems) -> + RefinedStorageApi.INSTANCE.addConstructorStrategyFactory((level, pos, direction, upgradeState, dropItems) -> Optional.of(new PlaceFluidConstructorStrategy(level, pos, direction))); - PlatformApi.INSTANCE.addConstructorStrategyFactory(new ItemDropConstructorStrategyFactory()); + RefinedStorageApi.INSTANCE.addConstructorStrategyFactory(new ItemDropConstructorStrategyFactory()); } private void registerStorageMonitorInsertionStrategies() { - PlatformApi.INSTANCE.addStorageMonitorInsertionStrategy(new ItemStorageMonitorInsertionStrategy()); - PlatformApi.INSTANCE.addStorageMonitorInsertionStrategy(new FluidStorageMonitorInsertionStrategy()); + RefinedStorageApi.INSTANCE.addStorageMonitorInsertionStrategy(new ItemStorageMonitorInsertionStrategy()); + RefinedStorageApi.INSTANCE.addStorageMonitorInsertionStrategy(new FluidStorageMonitorInsertionStrategy()); } private void registerStorageMonitorExtractionStrategies() { - PlatformApi.INSTANCE.addStorageMonitorExtractionStrategy(new ItemStorageMonitorExtractionStrategy()); - PlatformApi.INSTANCE.addStorageMonitorExtractionStrategy(new FluidStorageMonitorExtractionStrategy()); + RefinedStorageApi.INSTANCE.addStorageMonitorExtractionStrategy(new ItemStorageMonitorExtractionStrategy()); + RefinedStorageApi.INSTANCE.addStorageMonitorExtractionStrategy(new FluidStorageMonitorExtractionStrategy()); } private void registerNetworkComponents() { - PlatformApi.INSTANCE.getNetworkComponentMapFactory().addFactory( + RefinedStorageApi.INSTANCE.getNetworkComponentMapFactory().addFactory( EnergyNetworkComponent.class, network -> new EnergyNetworkComponentImpl() ); - PlatformApi.INSTANCE.getNetworkComponentMapFactory().addFactory( + RefinedStorageApi.INSTANCE.getNetworkComponentMapFactory().addFactory( GraphNetworkComponent.class, GraphNetworkComponentImpl::new ); - PlatformApi.INSTANCE.getNetworkComponentMapFactory().addFactory( + RefinedStorageApi.INSTANCE.getNetworkComponentMapFactory().addFactory( StorageNetworkComponent.class, network -> new PlatformStorageNetworkComponent() ); - PlatformApi.INSTANCE.getNetworkComponentMapFactory().addFactory( + RefinedStorageApi.INSTANCE.getNetworkComponentMapFactory().addFactory( PlatformSecurityNetworkComponent.class, - network -> new PlatformSecurityNetworkComponentImpl(PlatformApi.INSTANCE.createDefaultSecurityPolicy()) + network -> new PlatformSecurityNetworkComponentImpl( + RefinedStorageApi.INSTANCE.createDefaultSecurityPolicy() + ) ); - PlatformApi.INSTANCE.getNetworkComponentMapFactory().addFactory( + RefinedStorageApi.INSTANCE.getNetworkComponentMapFactory().addFactory( SecurityNetworkComponent.class, - network -> new SecurityNetworkComponentImpl(PlatformApi.INSTANCE.createDefaultSecurityPolicy()) + network -> new SecurityNetworkComponentImpl(RefinedStorageApi.INSTANCE.createDefaultSecurityPolicy()) ); } private void registerWirelessTransmitterRangeModifiers() { - PlatformApi.INSTANCE.addWirelessTransmitterRangeModifier(new BaseWirelessTransmitterRangeModifier()); - PlatformApi.INSTANCE.addWirelessTransmitterRangeModifier(new RangeUpgradeWirelessTransmitterRangeModifier()); - PlatformApi.INSTANCE.addWirelessTransmitterRangeModifier( + RefinedStorageApi.INSTANCE.addWirelessTransmitterRangeModifier(new BaseWirelessTransmitterRangeModifier()); + RefinedStorageApi.INSTANCE.addWirelessTransmitterRangeModifier( + new RangeUpgradeWirelessTransmitterRangeModifier() + ); + RefinedStorageApi.INSTANCE.addWirelessTransmitterRangeModifier( new CreativeRangeUpgradeWirelessTransmitterRangeModifier() ); } private void registerPermissions() { for (final BuiltinPermission permission : BuiltinPermission.values()) { - PlatformApi.INSTANCE.getPermissionRegistry().register(permission.getId(), permission); + RefinedStorageApi.INSTANCE.getPermissionRegistry().register(permission.getId(), permission); } } @@ -453,17 +457,17 @@ private void registerUpgrades(final RegistryCallback callback) { Items.INSTANCE.setStackUpgrade(stackUpgrade); final Supplier fortune1Upgrade = callback.register( ContentIds.FORTUNE_1_UPGRADE, - () -> new FortuneUpgradeItem(PlatformApi.INSTANCE.getUpgradeRegistry(), 1) + () -> new FortuneUpgradeItem(RefinedStorageApi.INSTANCE.getUpgradeRegistry(), 1) ); Items.INSTANCE.setFortune1Upgrade(fortune1Upgrade); final Supplier fortune2Upgrade = callback.register( ContentIds.FORTUNE_2_UPGRADE, - () -> new FortuneUpgradeItem(PlatformApi.INSTANCE.getUpgradeRegistry(), 2) + () -> new FortuneUpgradeItem(RefinedStorageApi.INSTANCE.getUpgradeRegistry(), 2) ); Items.INSTANCE.setFortune2Upgrade(fortune2Upgrade); final Supplier fortune3Upgrade = callback.register( ContentIds.FORTUNE_3_UPGRADE, - () -> new FortuneUpgradeItem(PlatformApi.INSTANCE.getUpgradeRegistry(), 3) + () -> new FortuneUpgradeItem(RefinedStorageApi.INSTANCE.getUpgradeRegistry(), 3) ); Items.INSTANCE.setFortune3Upgrade(fortune3Upgrade); final Supplier silkTouchUpgrade = callback.register( @@ -473,41 +477,41 @@ private void registerUpgrades(final RegistryCallback callback) { Items.INSTANCE.setSilkTouchUpgrade(silkTouchUpgrade); Items.INSTANCE.setRangeUpgrade(callback.register( ContentIds.RANGE_UPGRADE, - () -> new RangeUpgradeItem(PlatformApi.INSTANCE.getUpgradeRegistry(), false) + () -> new RangeUpgradeItem(RefinedStorageApi.INSTANCE.getUpgradeRegistry(), false) )); Items.INSTANCE.setCreativeRangeUpgrade(callback.register( ContentIds.CREATIVE_RANGE_UPGRADE, - () -> new RangeUpgradeItem(PlatformApi.INSTANCE.getUpgradeRegistry(), true) + () -> new RangeUpgradeItem(RefinedStorageApi.INSTANCE.getUpgradeRegistry(), true) )); } protected final void registerUpgradeMappings() { - PlatformApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.IMPORTER) + RefinedStorageApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.IMPORTER) .add(Items.INSTANCE.getSpeedUpgrade(), 4) .add(Items.INSTANCE.getStackUpgrade()) .add(Items.INSTANCE.getRegulatorUpgrade()); - PlatformApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.EXPORTER) + RefinedStorageApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.EXPORTER) .add(Items.INSTANCE.getSpeedUpgrade(), 4) .add(Items.INSTANCE.getStackUpgrade()) .add(Items.INSTANCE.getRegulatorUpgrade()); - PlatformApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.DESTRUCTOR) + RefinedStorageApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.DESTRUCTOR) .add(Items.INSTANCE.getSpeedUpgrade(), 4) .add(Items.INSTANCE.getFortune1Upgrade()) .add(Items.INSTANCE.getFortune2Upgrade()) .add(Items.INSTANCE.getFortune3Upgrade()) .add(Items.INSTANCE.getSilkTouchUpgrade()); - PlatformApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.CONSTRUCTOR) + RefinedStorageApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.CONSTRUCTOR) .add(Items.INSTANCE.getSpeedUpgrade(), 4) .add(Items.INSTANCE.getStackUpgrade()); - PlatformApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.WIRELESS_TRANSMITTER) + RefinedStorageApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.WIRELESS_TRANSMITTER) .add(Items.INSTANCE.getRangeUpgrade(), 4) .add(Items.INSTANCE.getCreativeRangeUpgrade()); - PlatformApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.DISK_INTERFACE) + RefinedStorageApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.DISK_INTERFACE) .add(Items.INSTANCE.getSpeedUpgrade(), 4) .add(Items.INSTANCE.getStackUpgrade()); } @@ -836,7 +840,7 @@ protected final void registerDataComponents(final RegistryCallback defaultSaveFunction); + + @Nullable + NetworkNodeContainerProvider getContainerProvider(Level level, BlockPos pos, @Nullable Direction direction); + + @Nullable + NetworkNodeContainerProvider getContainerProviderSafely(Level level, BlockPos pos, @Nullable Direction direction); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformProxy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformProxy.java index 517fc306b..463f34476 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformProxy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformProxy.java @@ -5,6 +5,7 @@ import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategyFactory; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; import com.refinedmods.refinedstorage.common.api.support.resource.FluidOperationResult; import com.refinedmods.refinedstorage.common.support.containermenu.MenuOpener; import com.refinedmods.refinedstorage.common.support.containermenu.TransferManager; @@ -237,6 +238,22 @@ public void saveSavedData(final SavedData savedData, ensureLoaded().saveSavedData(savedData, file, provider, defaultSaveFunction); } + @Nullable + @Override + public NetworkNodeContainerProvider getContainerProvider(final Level level, + final BlockPos pos, + final Direction direction) { + return ensureLoaded().getContainerProvider(level, pos, direction); + } + + @Nullable + @Override + public NetworkNodeContainerProvider getContainerProviderSafely(final Level level, + final BlockPos pos, + final Direction direction) { + return ensureLoaded().getContainerProviderSafely(level, pos, direction); + } + private Platform ensureLoaded() { if (platform == null) { throw new IllegalStateException("Platform not loaded yet"); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformApiImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/RefinedStorageApiImpl.java similarity index 92% rename from refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformApiImpl.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/RefinedStorageApiImpl.java index ebb2233ab..8a38b03fb 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformApiImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/RefinedStorageApiImpl.java @@ -10,7 +10,7 @@ import com.refinedmods.refinedstorage.api.network.node.NetworkNode; import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.constructordestructor.ConstructorStrategyFactory; import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategyFactory; import com.refinedmods.refinedstorage.common.api.exporter.ExporterTransferStrategyFactory; @@ -25,7 +25,6 @@ import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategy; import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategyFactory; import com.refinedmods.refinedstorage.common.api.importer.ImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage.common.api.security.BuiltinPermissions; import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; import com.refinedmods.refinedstorage.common.api.storage.StorageContainerItemHelper; import com.refinedmods.refinedstorage.common.api.storage.StorageRepository; @@ -34,9 +33,8 @@ import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorExtractionStrategy; import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorInsertionStrategy; import com.refinedmods.refinedstorage.common.api.support.energy.EnergyItemHelper; -import com.refinedmods.refinedstorage.common.api.support.network.ConnectionLogic; import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemHelper; import com.refinedmods.refinedstorage.common.api.support.registry.PlatformRegistry; import com.refinedmods.refinedstorage.common.api.support.resource.RecipeModIngredientConverter; @@ -56,7 +54,6 @@ import com.refinedmods.refinedstorage.common.grid.strategy.CompositeGridExtractionStrategy; import com.refinedmods.refinedstorage.common.grid.strategy.CompositeGridInsertionStrategy; import com.refinedmods.refinedstorage.common.grid.strategy.CompositeGridScrollingStrategy; -import com.refinedmods.refinedstorage.common.security.BuiltinPermission; import com.refinedmods.refinedstorage.common.storage.ClientStorageRepository; import com.refinedmods.refinedstorage.common.storage.StorageContainerItemHelperImpl; import com.refinedmods.refinedstorage.common.storage.StorageRepositoryImpl; @@ -67,7 +64,8 @@ import com.refinedmods.refinedstorage.common.support.energy.ItemBlockEnergyStorage; import com.refinedmods.refinedstorage.common.support.energy.ItemEnergyStorage; import com.refinedmods.refinedstorage.common.support.network.ConnectionProviderImpl; -import com.refinedmods.refinedstorage.common.support.network.InWorldNetworkNodeContainerImpl; +import com.refinedmods.refinedstorage.common.support.network.InWorldNetworkNodeContainerBuilder; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeContainerProviderImpl; import com.refinedmods.refinedstorage.common.support.network.item.NetworkItemHelperImpl; import com.refinedmods.refinedstorage.common.support.packet.c2s.C2SPackets; import com.refinedmods.refinedstorage.common.support.packet.s2c.S2CPackets; @@ -95,7 +93,6 @@ import java.util.PriorityQueue; import java.util.Queue; import java.util.Set; -import java.util.function.Supplier; import java.util.stream.Collectors; import javax.annotation.Nullable; @@ -118,7 +115,7 @@ import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; import static java.util.Objects.requireNonNull; -public class PlatformApiImpl implements PlatformApi { +public class RefinedStorageApiImpl implements RefinedStorageApi { private final StorageRepository clientStorageRepository = new ClientStorageRepository( C2SPackets::sendStorageInfoRequest ); @@ -170,7 +167,7 @@ public class PlatformApiImpl implements PlatformApi { private final PlatformRegistry permissionRegistry = new PlatformRegistryImpl<>(); private final List resourceExtractStrategies = new ArrayList<>(); - public PlatformApiImpl() { + public RefinedStorageApiImpl() { gridSynchronizerRegistry.register(createIdentifier("off"), NoopGridSynchronizer.INSTANCE); } @@ -281,21 +278,20 @@ public UpgradeRegistry getUpgradeRegistry() { } @Override - public InWorldNetworkNodeContainer createInWorldNetworkNodeContainer( - final BlockEntity blockEntity, - final NetworkNode node, - final String name, - final int priority, - final ConnectionLogic connectionLogic, - @Nullable final Supplier keyProvider - ) { - return new InWorldNetworkNodeContainerImpl(blockEntity, node, name, priority, connectionLogic, keyProvider); + public NetworkNodeContainerProvider createNetworkNodeContainerProvider() { + return new NetworkNodeContainerProviderImpl(); } @Override - public void onNetworkNodeContainerInitialized(final InWorldNetworkNodeContainer container, - @Nullable final Level level, - @Nullable final Runnable callback) { + public InWorldNetworkNodeContainer.Builder createNetworkNodeContainer(final BlockEntity blockEntity, + final NetworkNode networkNode) { + return new InWorldNetworkNodeContainerBuilder(blockEntity, networkNode); + } + + @Override + public void initializeNetworkNodeContainer(final InWorldNetworkNodeContainer container, + @Nullable final Level level, + @Nullable final Runnable callback) { if (level == null || level.isClientSide()) { return; } @@ -317,8 +313,8 @@ public void onNetworkNodeContainerInitialized(final InWorldNetworkNodeContainer } @Override - public void onNetworkNodeContainerRemoved(final InWorldNetworkNodeContainer container, - @Nullable final Level level) { + public void removeNetworkNodeContainer(final InWorldNetworkNodeContainer container, + @Nullable final Level level) { if (level == null || level.isClientSide()) { return; } @@ -335,8 +331,8 @@ public void onNetworkNodeContainerRemoved(final InWorldNetworkNodeContainer cont } @Override - public void onNetworkNodeContainerUpdated(final InWorldNetworkNodeContainer container, - @Nullable final Level level) { + public void updateNetworkNodeContainer(final InWorldNetworkNodeContainer container, + @Nullable final Level level) { if (level == null || level.isClientSide() || container.getNode().getNetwork() == null) { return; } @@ -529,11 +525,6 @@ public void useSlotReferencedItem(final Player player, final Item... items) { slotReferenceProvider.findForUse(player, items[0], validItems).ifPresent(C2SPackets::sendUseSlotReferencedItem); } - @Override - public BuiltinPermissions getBuiltinPermissions() { - return BuiltinPermission.VIEW; - } - @Override public PlatformRegistry getPermissionRegistry() { return permissionRegistry; @@ -564,12 +555,16 @@ public boolean canPlaceNetworkNode(final ServerPlayer player, final BlockState state) { for (final Direction direction : Direction.values()) { final BlockPos adjacentPos = pos.relative(direction); - final BlockEntity adjacentBlockEntity = level.getBlockEntity(adjacentPos); - if (!(adjacentBlockEntity instanceof NetworkNodeContainerBlockEntity adjacentContainerBlockEntity)) { + final NetworkNodeContainerProvider adjacentProvider = Platform.INSTANCE.getContainerProvider( + level, + adjacentPos, + direction.getOpposite() + ); + if (adjacentProvider == null) { continue; } - if (!adjacentContainerBlockEntity.canBuild(player)) { - PlatformApi.INSTANCE.sendNoPermissionMessage( + if (!adjacentProvider.canBuild(player)) { + RefinedStorageApi.INSTANCE.sendNoPermissionMessage( player, IdentifierUtil.createTranslation("misc", "no_permission.build.place", state.getBlock().getName()) ); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorBlockEntity.java index 61e4d20ae..d27776517 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorBlockEntity.java @@ -8,7 +8,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.constructordestructor.ConstructorStrategy; import com.refinedmods.refinedstorage.common.api.constructordestructor.ConstructorStrategyFactory; import com.refinedmods.refinedstorage.common.content.BlockEntities; @@ -54,7 +54,7 @@ public ConstructorBlockEntity(final BlockPos pos, final BlockState state) { new SimpleNetworkNode(Platform.INSTANCE.getConfig().getConstructor().getEnergyUsage()), UpgradeDestinations.CONSTRUCTOR ); - this.actor = new NetworkNodeActor(mainNode); + this.actor = new NetworkNodeActor(mainNetworkNode); } @Override @@ -71,7 +71,8 @@ protected void initialize(final ServerLevel level, final Direction direction) { private ConstructorStrategy createStrategy(final ServerLevel serverLevel, final Direction direction) { final Direction incomingDirection = direction.getOpposite(); final BlockPos sourcePosition = worldPosition.relative(direction); - final Collection factories = PlatformApi.INSTANCE.getConstructorStrategyFactories(); + final Collection factories = RefinedStorageApi.INSTANCE + .getConstructorStrategyFactories(); final List strategies = factories .stream() .flatMap(factory -> factory.create( @@ -88,14 +89,14 @@ private ConstructorStrategy createStrategy(final ServerLevel serverLevel, final @Override public void postDoWork() { if (taskExecutor == null - || mainNode.getNetwork() == null - || !mainNode.isActive() + || mainNetworkNode.getNetwork() == null + || !mainNetworkNode.isActive() || !(level instanceof ServerLevel serverLevel)) { return; } final Player fakePlayer = getFakePlayer(serverLevel); taskExecutor.execute(tasks, new TaskContext( - mainNode.getNetwork(), + mainNetworkNode.getNetwork(), fakePlayer )); } @@ -140,7 +141,7 @@ public AbstractContainerMenu createMenu(final int syncId, final Inventory invent @Override protected void setEnergyUsage(final long upgradeEnergyUsage) { final long baseEnergyUsage = Platform.INSTANCE.getConfig().getConstructor().getEnergyUsage(); - mainNode.setEnergyUsage(baseEnergyUsage + upgradeEnergyUsage); + mainNetworkNode.setEnergyUsage(baseEnergyUsage + upgradeEnergyUsage); } @Override diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorBlockEntity.java index c74ca14f5..0381141d7 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorBlockEntity.java @@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategy; import com.refinedmods.refinedstorage.common.content.BlockEntities; import com.refinedmods.refinedstorage.common.content.ContentNames; @@ -57,7 +57,7 @@ public DestructorBlockEntity(final BlockPos pos, final BlockState state) { new SimpleNetworkNode(Platform.INSTANCE.getConfig().getDestructor().getEnergyUsage()), UpgradeDestinations.DESTRUCTOR ); - this.actor = new NetworkNodeActor(mainNode); + this.actor = new NetworkNodeActor(mainNetworkNode); this.filterWithFuzzyMode = FilterWithFuzzyMode.createAndListenForUniqueFilters( ResourceContainerImpl.createForFilter(), this::setChanged, @@ -113,7 +113,7 @@ public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider @Override protected void setEnergyUsage(final long upgradeEnergyUsage) { final long baseEnergyUsage = Platform.INSTANCE.getConfig().getDestructor().getEnergyUsage(); - mainNode.setEnergyUsage(baseEnergyUsage + upgradeEnergyUsage); + mainNetworkNode.setEnergyUsage(baseEnergyUsage + upgradeEnergyUsage); } @Override @@ -147,7 +147,7 @@ public AbstractContainerMenu createMenu(final int syncId, final Inventory invent protected void initialize(final ServerLevel level, final Direction direction) { final BlockPos pos = getBlockPos().relative(direction); final Direction incomingDirection = direction.getOpposite(); - final List strategies = PlatformApi.INSTANCE.getDestructorStrategyFactories() + final List strategies = RefinedStorageApi.INSTANCE.getDestructorStrategyFactories() .stream() .flatMap(factory -> factory.create(level, pos, incomingDirection, upgradeContainer, pickupItems).stream()) .toList(); @@ -157,13 +157,13 @@ protected void initialize(final ServerLevel level, final Direction direction) { @Override public void postDoWork() { if (strategy == null - || mainNode.getNetwork() == null - || !mainNode.isActive() + || mainNetworkNode.getNetwork() == null + || !mainNetworkNode.isActive() || !(level instanceof ServerLevel serverLevel)) { return; } final Player fakePlayer = getFakePlayer(serverLevel); - strategy.apply(filter, actor, mainNode::getNetwork, fakePlayer); + strategy.apply(filter, actor, mainNetworkNode::getNetwork, fakePlayer); } @Override diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerBlockEntity.java index 23dc8d7dc..455822a92 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerBlockEntity.java @@ -43,7 +43,7 @@ public ControllerBlockEntity(final ControllerType type, final BlockPos pos, fina super(getBlockEntityType(type), pos, state, new ControllerNetworkNode()); this.type = type; this.energyStorage = createEnergyStorage(type, this); - this.mainNode.setEnergyStorage(energyStorage); + this.mainNetworkNode.setEnergyStorage(energyStorage); } private static EnergyStorage createEnergyStorage(final ControllerType type, final BlockEntity blockEntity) { @@ -64,7 +64,7 @@ private static BlockEntityType getBlockEntityType(final C public void updateEnergyTypeInLevel(final BlockState state) { final ControllerEnergyType currentEnergyType = state.getValue(AbstractControllerBlock.ENERGY_TYPE); - final ControllerEnergyType newEnergyType = ControllerEnergyType.ofState(mainNode.getState()); + final ControllerEnergyType newEnergyType = ControllerEnergyType.ofState(mainNetworkNode.getState()); if (newEnergyType != currentEnergyType && level != null && energyStateChangeRateLimiter.tryAcquire()) { LOGGER.debug( "Energy type state change for controller at {}: {} -> {}", @@ -79,12 +79,12 @@ public void updateEnergyTypeInLevel(final BlockState state) { @Override public void saveAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { super.saveAdditional(tag, provider); - ItemBlockEnergyStorage.writeToTag(tag, mainNode.getActualStored()); + ItemBlockEnergyStorage.writeToTag(tag, mainNetworkNode.getActualStored()); saveRenderingInfo(tag); } private void saveRenderingInfo(final CompoundTag tag) { - tag.putLong(TAG_CAPACITY, mainNode.getActualCapacity()); + tag.putLong(TAG_CAPACITY, mainNetworkNode.getActualCapacity()); } @Override @@ -114,11 +114,11 @@ public StreamEncoder getMenuCodec() { } long getActualStored() { - return mainNode.getActualStored(); + return mainNetworkNode.getActualStored(); } long getActualCapacity() { - return mainNode.getActualCapacity(); + return mainNetworkNode.getActualCapacity(); } @Override diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerBlockItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerBlockItem.java index 6c7eb5038..fa465951c 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerBlockItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerBlockItem.java @@ -3,7 +3,7 @@ import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage.api.network.impl.energy.EnergyStorageImpl; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; import com.refinedmods.refinedstorage.common.api.support.energy.AbstractEnergyBlockItem; import com.refinedmods.refinedstorage.common.content.BlockEntities; @@ -25,7 +25,7 @@ public class ControllerBlockItem extends AbstractEnergyBlockItem { private final Block block; ControllerBlockItem(final Block block) { - super(block, new Item.Properties().stacksTo(1), PlatformApi.INSTANCE.getEnergyItemHelper()); + super(block, new Item.Properties().stacksTo(1), RefinedStorageApi.INSTANCE.getEnergyItemHelper()); this.block = block; } @@ -48,7 +48,7 @@ public EnergyStorage createEnergyStorage(final ItemStack stack) { final EnergyStorage energyStorage = new EnergyStorageImpl( Platform.INSTANCE.getConfig().getController().getEnergyCapacity() ); - return PlatformApi.INSTANCE.asBlockItemEnergyStorage( + return RefinedStorageApi.INSTANCE.asBlockItemEnergyStorage( energyStorage, stack, BlockEntities.INSTANCE.getController() @@ -57,8 +57,12 @@ public EnergyStorage createEnergyStorage(final ItemStack stack) { @Override protected boolean placeBlock(final BlockPlaceContext ctx, final BlockState state) { - if (ctx.getPlayer() instanceof ServerPlayer serverPlayer - && !(PlatformApi.INSTANCE.canPlaceNetworkNode(serverPlayer, ctx.getLevel(), ctx.getClickedPos(), state))) { + if (ctx.getPlayer() instanceof ServerPlayer serverPlayer && !(RefinedStorageApi.INSTANCE.canPlaceNetworkNode( + serverPlayer, + ctx.getLevel(), + ctx.getClickedPos(), + state)) + ) { return false; } return super.placeBlock(ctx, state); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerItemPropertyFunction.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerItemPropertyFunction.java index 7f200d0cc..e17f34ceb 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerItemPropertyFunction.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/controller/ControllerItemPropertyFunction.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.controller; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import javax.annotation.Nullable; @@ -15,7 +15,7 @@ public float unclampedCall(final ItemStack stack, @Nullable final ClientLevel level, @Nullable final LivingEntity entity, final int seed) { - return PlatformApi.INSTANCE.getEnergyStorage(stack).map(energyStorage -> { + return RefinedStorageApi.INSTANCE.getEnergyStorage(stack).map(energyStorage -> { if (energyStorage.getStored() == 0) { return 1F; } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorBlockEntity.java index 15f0eb053..f3e5606be 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorBlockEntity.java @@ -5,7 +5,8 @@ import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorMode; import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorNetworkNode; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; +import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; import com.refinedmods.refinedstorage.common.content.BlockEntities; @@ -23,7 +24,6 @@ import com.google.common.util.concurrent.RateLimiter; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.RegistryFriendlyByteBuf; @@ -60,17 +60,24 @@ public DetectorBlockEntity(final BlockPos pos, final BlockState state) { propagateAmount(); setChanged(); }, - filters -> mainNode.setConfiguredResource(filters.isEmpty() ? null : filters.getFirst()) + filters -> mainNetworkNode.setConfiguredResource(filters.isEmpty() ? null : filters.getFirst()) ); initialize(); } + @Override + protected InWorldNetworkNodeContainer createMainContainer(final DetectorNetworkNode networkNode) { + return RefinedStorageApi.INSTANCE.createNetworkNodeContainer(this, networkNode) + .connectionStrategy(new DetectorConnectionStrategy(this::getBlockState, getBlockPos())) + .build(); + } + @Override public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { super.writeConfiguration(tag, provider); filter.save(tag, provider); tag.putDouble(TAG_AMOUNT, amount); - tag.putInt(TAG_MODE, DetectorModeSettings.getDetectorMode(mainNode.getMode())); + tag.putInt(TAG_MODE, DetectorModeSettings.getDetectorMode(mainNetworkNode.getMode())); } @Override @@ -81,7 +88,7 @@ public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider this.amount = tag.getDouble(TAG_AMOUNT); } if (tag.contains(TAG_MODE)) { - mainNode.setMode(DetectorModeSettings.getDetectorMode(tag.getInt(TAG_MODE))); + mainNetworkNode.setMode(DetectorModeSettings.getDetectorMode(tag.getInt(TAG_MODE))); } initialize(); propagateAmount(); @@ -99,7 +106,7 @@ private void propagateAmount() { ? (long) amount : configuredResource.getResourceType().normalizeAmount(amount); LOGGER.debug("Updating detector amount of {} normalized as {}", amount, normalizedAmount); - mainNode.setAmount(normalizedAmount); + mainNetworkNode.setAmount(normalizedAmount); } boolean isFuzzyMode() { @@ -112,12 +119,12 @@ void setFuzzyMode(final boolean fuzzyMode) { } void setMode(final DetectorMode mode) { - mainNode.setMode(mode); + mainNetworkNode.setMode(mode); setChanged(); } DetectorMode getMode() { - return mainNode.getMode(); + return mainNetworkNode.getMode(); } private void initialize() { @@ -125,7 +132,7 @@ private void initialize() { final DetectorAmountStrategy strategy = isFuzzyMode() ? new FuzzyDetectorAmountStrategy(defaultStrategy) : defaultStrategy; - mainNode.setAmountStrategy(strategy); + mainNetworkNode.setAmountStrategy(strategy); } @Override @@ -156,39 +163,13 @@ public AbstractContainerMenu createMenu(final int syncId, final Inventory invent @Override public void updateActiveness(final BlockState state, @Nullable final BooleanProperty activenessProperty) { super.updateActiveness(state, activenessProperty); - final boolean powered = mainNode.isActive() && mainNode.isActivated(); + final boolean powered = mainNetworkNode.isActive() && mainNetworkNode.isActivated(); final boolean needToUpdatePowered = state.getValue(DetectorBlock.POWERED) != powered; if (level != null && needToUpdatePowered && poweredChangeRateLimiter.tryAcquire()) { level.setBlockAndUpdate(getBlockPos(), state.setValue(DetectorBlock.POWERED, powered)); } } - @Override - public void addOutgoingConnections(final ConnectionSink sink) { - final Direction myDirection = getDirection(); - if (myDirection == null) { - return; - } - for (final Direction direction : Direction.values()) { - if (direction == myDirection.getOpposite()) { - continue; - } - sink.tryConnectInSameDimension(worldPosition.relative(direction), direction.getOpposite()); - } - } - - @Override - public boolean canAcceptIncomingConnection(final Direction incomingDirection, final BlockState connectingState) { - if (!colorsAllowConnecting(connectingState)) { - return false; - } - final Direction myDirection = getDirection(); - if (myDirection != null) { - return myDirection != incomingDirection.getOpposite(); - } - return true; - } - @Override protected boolean doesBlockStateChangeWarrantNetworkNodeUpdate(final BlockState oldBlockState, final BlockState newBlockState) { diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorConnectionStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorConnectionStrategy.java new file mode 100644 index 000000000..55899b739 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/detector/DetectorConnectionStrategy.java @@ -0,0 +1,44 @@ +package com.refinedmods.refinedstorage.common.detector; + +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.common.support.network.ColoredConnectionStrategy; + +import java.util.function.Supplier; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.level.block.state.BlockState; + +import static com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock.tryExtractDirection; + +class DetectorConnectionStrategy extends ColoredConnectionStrategy { + DetectorConnectionStrategy(final Supplier blockStateProvider, final BlockPos origin) { + super(blockStateProvider, origin); + } + + @Override + public void addOutgoingConnections(final ConnectionSink sink) { + final Direction myDirection = tryExtractDirection(blockStateProvider.get()); + if (myDirection == null) { + return; + } + for (final Direction direction : Direction.values()) { + if (direction == myDirection.getOpposite()) { + continue; + } + sink.tryConnectInSameDimension(origin.relative(direction), direction.getOpposite()); + } + } + + @Override + public boolean canAcceptIncomingConnection(final Direction incomingDirection, final BlockState connectingState) { + if (!colorsAllowConnecting(connectingState)) { + return false; + } + final Direction myDirection = tryExtractDirection(blockStateProvider.get()); + if (myDirection != null) { + return myDirection != incomingDirection.getOpposite(); + } + return true; + } +} diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterBlockEntity.java index 4179ee557..f4f69e761 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterBlockEntity.java @@ -6,9 +6,9 @@ import com.refinedmods.refinedstorage.api.network.node.task.TaskExecutor; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; -import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.exporter.ExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.content.BlockEntities; import com.refinedmods.refinedstorage.common.content.ContentNames; import com.refinedmods.refinedstorage.common.content.Items; @@ -50,14 +50,14 @@ public ExporterBlockEntity(final BlockPos pos, final BlockState state) { protected void initialize(final ServerLevel level, final Direction direction) { final ExporterTransferStrategy strategy = createStrategy(level, direction); LOGGER.debug("Initialized exporter at {} with strategy {}", worldPosition, strategy); - mainNode.setTransferStrategy(strategy); + mainNetworkNode.setTransferStrategy(strategy); } private ExporterTransferStrategy createStrategy(final ServerLevel serverLevel, final Direction direction) { final Direction incomingDirection = direction.getOpposite(); final BlockPos sourcePosition = worldPosition.relative(direction); final List factories = - PlatformApi.INSTANCE.getExporterTransferStrategyRegistry().getAll(); + RefinedStorageApi.INSTANCE.getExporterTransferStrategyRegistry().getAll(); final List strategies = factories .stream() .map(factory -> factory.create( @@ -75,7 +75,7 @@ private ExporterTransferStrategy createStrategy(final ServerLevel serverLevel, f @Override protected void setEnergyUsage(final long upgradeEnergyUsage) { final long baseEnergyUsage = Platform.INSTANCE.getConfig().getExporter().getEnergyUsage(); - mainNode.setEnergyUsage(baseEnergyUsage + upgradeEnergyUsage); + mainNetworkNode.setEnergyUsage(baseEnergyUsage + upgradeEnergyUsage); } @Override @@ -91,16 +91,18 @@ public AbstractContainerMenu createMenu(final int syncId, final Inventory invent @Override protected void setTaskExecutor(final TaskExecutor taskExecutor) { - mainNode.setTaskExecutor(taskExecutor); + mainNetworkNode.setTaskExecutor(taskExecutor); } @Override protected void setFilters(final List filters) { - mainNode.setFilters(filters); + mainNetworkNode.setFilters(filters); } @Override - public long overrideAmount(final ResourceKey resource, final long amount, final LongSupplier currentAmountSupplier) { + public long overrideAmount(final ResourceKey resource, + final long amount, + final LongSupplier currentAmountSupplier) { if (!upgradeContainer.has(Items.INSTANCE.getRegulatorUpgrade())) { return amount; } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridBlockEntity.java index b0e04815d..dc07da7c7 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridBlockEntity.java @@ -10,7 +10,7 @@ import com.refinedmods.refinedstorage.api.storage.Storage; import com.refinedmods.refinedstorage.api.storage.TrackedResourceAmount; import com.refinedmods.refinedstorage.api.storage.root.RootStorage; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.grid.Grid; import com.refinedmods.refinedstorage.common.api.security.PlatformSecurityNetworkComponent; import com.refinedmods.refinedstorage.common.api.storage.PlayerActor; @@ -19,6 +19,7 @@ import com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock; import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeExtendedMenuProvider; import com.refinedmods.refinedstorage.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.support.network.ColoredConnectionStrategy; import java.util.List; @@ -42,15 +43,11 @@ protected AbstractGridBlockEntity(final BlockEntityType getMenuCodec() { @Override public List getResources(final Class actorType) { - return requireNonNull(mainNode.getNetwork()) + return requireNonNull(mainNetworkNode.getNetwork()) .getComponent(StorageNetworkComponent.class) .getResources(actorType); } @Override public GridOperations createOperations(final ResourceType resourceType, final ServerPlayer player) { - final Network network = requireNonNull(mainNode.getNetwork()); + final Network network = requireNonNull(mainNetworkNode.getNetwork()); final RootStorage rootStorage = network.getComponent(StorageNetworkComponent.class); final PlatformSecurityNetworkComponent security = network.getComponent(PlatformSecurityNetworkComponent.class); final GridOperations operations = resourceType.createGridOperations(rootStorage, new PlayerActor(player)); @@ -81,22 +78,22 @@ public GridOperations createOperations(final ResourceType resourceType, final Se @Override public boolean isGridActive() { - return mainNode.isActive(); + return mainNetworkNode.isActive(); } @Override public Storage getItemStorage() { - return requireNonNull(mainNode.getNetwork()).getComponent(StorageNetworkComponent.class); + return requireNonNull(mainNetworkNode.getNetwork()).getComponent(StorageNetworkComponent.class); } @Override public void addWatcher(final GridWatcher watcher, final Class actorType) { - mainNode.addWatcher(watcher, actorType); + mainNetworkNode.addWatcher(watcher, actorType); } @Override public void removeWatcher(final GridWatcher watcher) { - mainNode.removeWatcher(watcher); + mainNetworkNode.removeWatcher(watcher); } @Override diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridContainerMenu.java index 612dc3bd0..9ef83b6c6 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridContainerMenu.java @@ -14,7 +14,7 @@ import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; import com.refinedmods.refinedstorage.common.Config; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.grid.Grid; import com.refinedmods.refinedstorage.common.api.grid.GridResourceAttributeKeys; import com.refinedmods.refinedstorage.common.api.grid.GridScrollMode; @@ -139,7 +139,7 @@ protected AbstractGridContainerMenu( private Predicate filterResourceType() { return gridResource -> Platform.INSTANCE.getConfig().getGrid().getResourceType().flatMap(resourceTypeId -> - PlatformApi.INSTANCE + RefinedStorageApi.INSTANCE .getResourceTypeRegistry() .get(resourceTypeId) .map(type -> type.isGridResourceBelonging(gridResource)) @@ -148,7 +148,7 @@ private Predicate filterResourceType() { private static GridViewBuilder createViewBuilder() { return new GridViewBuilderImpl( - new CompositeGridResourceFactory(PlatformApi.INSTANCE.getResourceTypeRegistry()), + new CompositeGridResourceFactory(RefinedStorageApi.INSTANCE.getResourceTypeRegistry()), GridSortingTypes.NAME, GridSortingTypes.QUANTITY ); @@ -269,17 +269,17 @@ public void invalidate() { } private void initStrategies(final ServerPlayer player) { - this.insertionStrategy = PlatformApi.INSTANCE.createGridInsertionStrategy( + this.insertionStrategy = RefinedStorageApi.INSTANCE.createGridInsertionStrategy( this, player, requireNonNull(grid) ); - this.extractionStrategy = PlatformApi.INSTANCE.createGridExtractionStrategy( + this.extractionStrategy = RefinedStorageApi.INSTANCE.createGridExtractionStrategy( this, player, requireNonNull(grid) ); - this.scrollingStrategy = PlatformApi.INSTANCE.createGridScrollingStrategy( + this.scrollingStrategy = RefinedStorageApi.INSTANCE.createGridScrollingStrategy( this, player, requireNonNull(grid) @@ -311,7 +311,7 @@ private GridSynchronizer loadSynchronizer() { .getConfig() .getGrid() .getSynchronizer() - .flatMap(id -> PlatformApi.INSTANCE.getGridSynchronizerRegistry().get(id)) + .flatMap(id -> RefinedStorageApi.INSTANCE.getGridSynchronizerRegistry().get(id)) .orElse(NoopGridSynchronizer.INSTANCE); } @@ -321,7 +321,7 @@ private ResourceType loadResourceType() { .getConfig() .getGrid() .getResourceType() - .flatMap(id -> PlatformApi.INSTANCE.getResourceTypeRegistry().get(id)) + .flatMap(id -> RefinedStorageApi.INSTANCE.getResourceTypeRegistry().get(id)) .orElse(null); } @@ -335,7 +335,7 @@ public ResourceType getResourceType() { } public void toggleSynchronizer() { - final PlatformRegistry registry = PlatformApi.INSTANCE.getGridSynchronizerRegistry(); + final PlatformRegistry registry = RefinedStorageApi.INSTANCE.getGridSynchronizerRegistry(); final Config.GridEntry config = Platform.INSTANCE.getConfig().getGrid(); final GridSynchronizer newSynchronizer = registry.nextOrNullIfLast(getSynchronizer()); if (newSynchronizer == null) { @@ -347,7 +347,7 @@ public void toggleSynchronizer() { } public void toggleResourceType() { - final PlatformRegistry registry = PlatformApi.INSTANCE.getResourceTypeRegistry(); + final PlatformRegistry registry = RefinedStorageApi.INSTANCE.getResourceTypeRegistry(); final Config.GridEntry config = Platform.INSTANCE.getConfig().getGrid(); final ResourceType newResourceType = resourceTypeFilter == null ? ResourceTypes.ITEM diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridBlockEntity.java index 7b6957c86..af272ec47 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/CraftingGridBlockEntity.java @@ -141,10 +141,10 @@ public NonNullList getDrops() { } Optional getNetwork() { - if (!mainNode.isActive()) { + if (!mainNetworkNode.isActive()) { return Optional.empty(); } - return Optional.ofNullable(mainNode.getNetwork()); + return Optional.ofNullable(mainNetworkNode.getNetwork()); } Optional getRootStorage() { diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/SecuredGridOperations.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/SecuredGridOperations.java index 2188b738d..918741538 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/SecuredGridOperations.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/SecuredGridOperations.java @@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; import com.refinedmods.refinedstorage.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.security.PlatformSecurityNetworkComponent; import com.refinedmods.refinedstorage.common.security.BuiltinPermission; @@ -36,7 +36,7 @@ public boolean extract(final ResourceKey resource, final GridExtractMode extractMode, final InsertableStorage destination) { if (!securityNetworkComponent.isAllowed(BuiltinPermission.EXTRACT, player)) { - PlatformApi.INSTANCE.sendNoPermissionMessage(player, CANNOT_EXTRACT_MESSAGE); + RefinedStorageApi.INSTANCE.sendNoPermissionMessage(player, CANNOT_EXTRACT_MESSAGE); return false; } return delegate.extract(resource, extractMode, destination); @@ -46,7 +46,7 @@ public boolean extract(final ResourceKey resource, public boolean insert(final ResourceKey resource, final GridInsertMode insertMode, final ExtractableStorage source) { if (!securityNetworkComponent.isAllowed(BuiltinPermission.INSERT, player)) { - PlatformApi.INSTANCE.sendNoPermissionMessage(player, CANNOT_INSERT_MESSAGE); + RefinedStorageApi.INSTANCE.sendNoPermissionMessage(player, CANNOT_INSERT_MESSAGE); return false; } return delegate.insert(resource, insertMode, source); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridItem.java index 59b37b328..16f203208 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGridItem.java @@ -3,7 +3,7 @@ import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage.api.network.impl.energy.EnergyStorageImpl; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.grid.Grid; import com.refinedmods.refinedstorage.common.api.security.SecurityHelper; import com.refinedmods.refinedstorage.common.api.support.energy.AbstractNetworkEnergyItem; @@ -20,8 +20,8 @@ public class WirelessGridItem extends AbstractNetworkEnergyItem { public WirelessGridItem() { super( new Item.Properties().stacksTo(1), - PlatformApi.INSTANCE.getEnergyItemHelper(), - PlatformApi.INSTANCE.getNetworkItemHelper() + RefinedStorageApi.INSTANCE.getEnergyItemHelper(), + RefinedStorageApi.INSTANCE.getNetworkItemHelper() ); } @@ -29,7 +29,7 @@ public EnergyStorage createEnergyStorage(final ItemStack stack) { final EnergyStorage energyStorage = new EnergyStorageImpl( Platform.INSTANCE.getConfig().getWirelessGrid().getEnergyCapacity() ); - return PlatformApi.INSTANCE.asItemEnergyStorage(energyStorage, stack); + return RefinedStorageApi.INSTANCE.asItemEnergyStorage(energyStorage, stack); } @Override @@ -40,7 +40,7 @@ protected void use(final ServerPlayer player, .map(network -> SecurityHelper.isAllowed(player, BuiltinPermission.OPEN, network)) .orElse(true); // if the network can't be resolved that will be apparent later in the UI. if (!isAllowed) { - PlatformApi.INSTANCE.sendNoPermissionToOpenMessage(player, ContentNames.WIRELESS_GRID); + RefinedStorageApi.INSTANCE.sendNoPermissionToOpenMessage(player, ContentNames.WIRELESS_GRID); return; } final Grid grid = new WirelessGrid(context); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/AbstractGridScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/AbstractGridScreen.java index 292af1da4..165eda4b4 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/AbstractGridScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/AbstractGridScreen.java @@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.api.grid.view.GridView; import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.grid.GridScrollMode; import com.refinedmods.refinedstorage.common.api.grid.view.PlatformGridResource; import com.refinedmods.refinedstorage.common.grid.AbstractGridContainerMenu; @@ -99,7 +99,7 @@ protected void init(final int rows) { addSideButton(new AutoSelectedSideButtonWidget(getMenu())); addSideButton(new ResourceTypeSideButtonWidget(getMenu())); - final boolean onlyHasNoopSynchronizer = PlatformApi.INSTANCE.getGridSynchronizerRegistry() + final boolean onlyHasNoopSynchronizer = RefinedStorageApi.INSTANCE.getGridSynchronizerRegistry() .getAll() .stream() .allMatch(synchronizer -> synchronizer == NoopGridSynchronizer.INSTANCE); @@ -290,7 +290,7 @@ private void renderOverStorageAreaTooltip(final GuiGraphics graphics, final int if (carried.isEmpty()) { return; } - final List hints = PlatformApi.INSTANCE.getGridInsertionHints().getHints(carried); + final List hints = RefinedStorageApi.INSTANCE.getGridInsertionHints().getHints(carried); Platform.INSTANCE.renderTooltip(graphics, hints, x, y); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/ExportedResourcesContainer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/ExportedResourcesContainer.java index f9876f3a1..afff56c66 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/ExportedResourcesContainer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/ExportedResourcesContainer.java @@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.root.RootStorage; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.storage.root.FuzzyRootStorage; import com.refinedmods.refinedstorage.common.api.support.resource.FuzzyModeNormalizer; import com.refinedmods.refinedstorage.common.support.FilterWithFuzzyMode; @@ -22,8 +22,8 @@ public class ExportedResourcesContainer extends ResourceContainerImpl implements super( size, InterfaceBlockEntity::getTransferQuota, - PlatformApi.INSTANCE.getItemResourceFactory(), - PlatformApi.INSTANCE.getAlternativeResourceFactories() + RefinedStorageApi.INSTANCE.getItemResourceFactory(), + RefinedStorageApi.INSTANCE.getAlternativeResourceFactories() ); this.filter = filter; } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceBlockEntity.java index 7bcae875f..ddb9fde06 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/iface/InterfaceBlockEntity.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.network.impl.node.iface.externalstorage.InterfaceExternalStorageProviderImpl; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; import com.refinedmods.refinedstorage.common.content.BlockEntities; @@ -51,21 +51,21 @@ public InterfaceBlockEntity(final BlockPos pos, final BlockState state) { state, new InterfaceNetworkNode(Platform.INSTANCE.getConfig().getInterface().getEnergyUsage()) ); - this.mainNode.setTransferQuotaProvider(InterfaceBlockEntity::getTransferQuota); + this.mainNetworkNode.setTransferQuotaProvider(InterfaceBlockEntity::getTransferQuota); this.filter = FilterWithFuzzyMode.create(createFilterContainer(), this::setChanged); this.exportedResources = createExportedResourcesContainer(filter); this.exportedResources.setListener(this::setChanged); - this.mainNode.setExportState(exportedResources); + this.mainNetworkNode.setExportState(exportedResources); this.exportedResourcesAsContainer = exportedResources.toItemContainer(); - this.externalStorageProvider = new InterfaceExternalStorageProviderImpl(mainNode); + this.externalStorageProvider = new InterfaceExternalStorageProviderImpl(mainNetworkNode); } static ResourceContainer createFilterContainer() { return new ResourceContainerImpl( EXPORT_SLOTS, InterfaceBlockEntity::getTransferQuota, - PlatformApi.INSTANCE.getItemResourceFactory(), - PlatformApi.INSTANCE.getAlternativeResourceFactories() + RefinedStorageApi.INSTANCE.getItemResourceFactory(), + RefinedStorageApi.INSTANCE.getAlternativeResourceFactories() ); } @@ -190,6 +190,6 @@ InterfaceExternalStorageProvider getExternalStorageProvider() { } InterfaceNetworkNode getInterface() { - return mainNode; + return mainNetworkNode; } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterBlockEntity.java index 6547edb49..38ee56e23 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterBlockEntity.java @@ -5,9 +5,9 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; -import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.importer.ImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.content.BlockEntities; import com.refinedmods.refinedstorage.common.content.ContentNames; import com.refinedmods.refinedstorage.common.content.Items; @@ -62,21 +62,21 @@ public ImporterBlockEntity(final BlockPos pos, final BlockState state) { this::setChanged, this::setFilters ); - this.mainNode.setNormalizer(filter.createNormalizer()); + this.mainNetworkNode.setNormalizer(filter.createNormalizer()); } @Override protected void initialize(final ServerLevel level, final Direction direction) { final List strategies = createStrategies(level, direction); LOGGER.debug("Initialized importer at {} with strategies {}", worldPosition, strategies); - mainNode.setTransferStrategies(strategies); + mainNetworkNode.setTransferStrategies(strategies); } private List createStrategies(final ServerLevel serverLevel, final Direction direction) { final Direction incomingDirection = direction.getOpposite(); final BlockPos sourcePosition = worldPosition.relative(direction); final List factories = - PlatformApi.INSTANCE.getImporterTransferStrategyRegistry().getAll(); + RefinedStorageApi.INSTANCE.getImporterTransferStrategyRegistry().getAll(); return factories .stream() .map(factory -> factory.create(serverLevel, sourcePosition, incomingDirection, upgradeContainer, this)) @@ -86,7 +86,7 @@ private List createStrategies(final ServerLevel server @Override public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { super.writeConfiguration(tag, provider); - tag.putInt(TAG_FILTER_MODE, FilterModeSettings.getFilterMode(mainNode.getFilterMode())); + tag.putInt(TAG_FILTER_MODE, FilterModeSettings.getFilterMode(mainNetworkNode.getFilterMode())); filter.save(tag, provider); } @@ -94,13 +94,13 @@ public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provide public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { super.readConfiguration(tag, provider); if (tag.contains(TAG_FILTER_MODE)) { - mainNode.setFilterMode(FilterModeSettings.getFilterMode(tag.getInt(TAG_FILTER_MODE))); + mainNetworkNode.setFilterMode(FilterModeSettings.getFilterMode(tag.getInt(TAG_FILTER_MODE))); } filter.load(tag, provider); } void setFilters(final Set filters) { - mainNode.setFilters(filters); + mainNetworkNode.setFilters(filters); } boolean isFuzzyMode() { @@ -112,18 +112,18 @@ void setFuzzyMode(final boolean fuzzyMode) { } FilterMode getFilterMode() { - return mainNode.getFilterMode(); + return mainNetworkNode.getFilterMode(); } void setFilterMode(final FilterMode mode) { - mainNode.setFilterMode(mode); + mainNetworkNode.setFilterMode(mode); setChanged(); } @Override protected void setEnergyUsage(final long upgradeEnergyUsage) { final long baseEnergyUsage = Platform.INSTANCE.getConfig().getImporter().getEnergyUsage(); - mainNode.setEnergyUsage(baseEnergyUsage + upgradeEnergyUsage); + mainNetworkNode.setEnergyUsage(baseEnergyUsage + upgradeEnergyUsage); } @Override @@ -156,7 +156,11 @@ public long overrideAmount(final ResourceKey resource, } return upgradeContainer.getRegulatedAmount(resource) .stream() - .map(desiredAmount -> getAmountStillAvailableForImport(amount, currentAmountSupplier.getAsLong(), desiredAmount)) + .map(desiredAmount -> getAmountStillAvailableForImport( + amount, + currentAmountSupplier.getAsLong(), + desiredAmount + )) .findFirst() .orElse(amount); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkReceiverBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkReceiverBlockEntity.java index d4b7ec837..e9c2663dc 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkReceiverBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkReceiverBlockEntity.java @@ -2,14 +2,18 @@ import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; import com.refinedmods.refinedstorage.common.content.BlockEntities; import com.refinedmods.refinedstorage.common.support.network.BaseNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.support.network.ColoredConnectionStrategy; import net.minecraft.core.BlockPos; +import net.minecraft.core.GlobalPos; import net.minecraft.world.level.block.state.BlockState; +import static java.util.Objects.requireNonNull; + public class NetworkReceiverBlockEntity extends BaseNetworkNodeContainerBlockEntity { public NetworkReceiverBlockEntity(final BlockPos pos, final BlockState state) { super( @@ -21,14 +25,14 @@ public NetworkReceiverBlockEntity(final BlockPos pos, final BlockState state) { } @Override - protected InWorldNetworkNodeContainer createMainContainer(final SimpleNetworkNode node) { - return PlatformApi.INSTANCE.createInWorldNetworkNodeContainer( - this, - node, - MAIN_CONTAINER_NAME, - 0, - this, - () -> new NetworkReceiverKey(mainContainer.getPosition()) - ); + protected InWorldNetworkNodeContainer createMainContainer(final SimpleNetworkNode networkNode) { + return RefinedStorageApi.INSTANCE.createNetworkNodeContainer(this, networkNode) + .connectionStrategy(new ColoredConnectionStrategy(this::getBlockState, getBlockPos())) + .keyProvider(this::createKey) + .build(); + } + + private NetworkReceiverKey createKey() { + return new NetworkReceiverKey(GlobalPos.of(requireNonNull(level).dimension(), getBlockPos())); } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterBlockEntity.java index 5e7d1c5e2..5f32d3502 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/NetworkTransmitterBlockEntity.java @@ -4,12 +4,15 @@ import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; import com.refinedmods.refinedstorage.api.network.node.GraphNetworkComponent; import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; import com.refinedmods.refinedstorage.common.content.BlockEntities; import com.refinedmods.refinedstorage.common.content.ContentNames; import com.refinedmods.refinedstorage.common.support.BlockEntityWithDrops; import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeExtendedMenuProvider; import com.refinedmods.refinedstorage.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.support.network.ColoredConnectionStrategy; import com.refinedmods.refinedstorage.common.util.ContainerUtil; import javax.annotation.Nullable; @@ -68,15 +71,30 @@ public NetworkTransmitterBlockEntity(final BlockPos pos, final BlockState state) if (level != null) { LOGGER.debug("Network card was changed at {}, sending network update", worldPosition); setChanged(); - updateContainers(); + containers.update(level); } }); } + @Override + protected InWorldNetworkNodeContainer createMainContainer(final SimpleNetworkNode networkNode) { + return RefinedStorageApi.INSTANCE.createNetworkNodeContainer(this, networkNode) + .connectionStrategy(new ColoredConnectionStrategy(this::getBlockState, getBlockPos()) { + @Override + public void addOutgoingConnections(final ConnectionSink sink) { + super.addOutgoingConnections(sink); + if (receiverKey != null && NetworkTransmitterBlockEntity.this.mainNetworkNode.isActive()) { + sink.tryConnect(receiverKey.pos()); + } + } + }) + .build(); + } + @Override protected void activenessChanged(final boolean newActive) { super.activenessChanged(newActive); - updateContainers(); + containers.update(level); } public void updateStateInLevel(final BlockState state) { @@ -89,13 +107,13 @@ public void updateStateInLevel(final BlockState state) { } private NetworkTransmitterState calculateState() { - if (!mainNode.isActive()) { + if (!mainNetworkNode.isActive()) { return NetworkTransmitterState.INACTIVE; } if (receiverKey == null) { return NetworkTransmitterState.ERROR; } - final Network network = mainNode.getNetwork(); + final Network network = mainNetworkNode.getNetwork(); if (network == null) { return NetworkTransmitterState.ERROR; } @@ -104,8 +122,8 @@ private NetworkTransmitterState calculateState() { } NetworkTransmitterData getStatus() { - final Network network = mainNode.getNetwork(); - if (!mainNode.isActive() || network == null || level == null) { + final Network network = mainNetworkNode.getNetwork(); + if (!mainNetworkNode.isActive() || network == null || level == null) { return INACTIVE; } if (receiverKey == null) { @@ -126,10 +144,10 @@ NetworkTransmitterData getStatus() { @Override public void doWork() { super.doWork(); - if (!mainNode.isActive() || mainNode.getNetwork() == null || receiverKey == null) { + if (!mainNetworkNode.isActive() || mainNetworkNode.getNetwork() == null || receiverKey == null) { return; } - final boolean receiverFound = isReceiverFoundInNetwork(mainNode.getNetwork(), receiverKey); + final boolean receiverFound = isReceiverFoundInNetwork(mainNetworkNode.getNetwork(), receiverKey); if (!receiverFound && networkRebuildRetryRateLimiter.tryAcquire()) { tryReconnectingWithReceiver(); } @@ -141,7 +159,7 @@ private void tryReconnectingWithReceiver() { receiverKey, worldPosition ); - updateContainers(); + containers.update(level); } private static boolean isReceiverFoundInNetwork(final Network network, final NetworkReceiverKey key) { @@ -196,12 +214,4 @@ public Component getDisplayName() { public NonNullList getDrops() { return NonNullList.of(ItemStack.EMPTY, networkCardInventory.getNetworkCard()); } - - @Override - public void addOutgoingConnections(final ConnectionSink sink) { - super.addOutgoingConnections(sink); - if (receiverKey != null && mainNode.isActive()) { - sink.tryConnect(receiverKey.pos()); - } - } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayBlockEntity.java index 66c99723f..6d8ff6b94 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayBlockEntity.java @@ -7,6 +7,7 @@ import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; import com.refinedmods.refinedstorage.api.storage.AccessMode; import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; import com.refinedmods.refinedstorage.common.content.BlockEntities; import com.refinedmods.refinedstorage.common.content.ContentNames; @@ -35,6 +36,7 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.level.block.state.BlockState; +import static com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock.tryExtractDirection; import static java.util.Objects.requireNonNull; public class RelayBlockEntity extends AbstractRedstoneModeNetworkNodeContainerBlockEntity @@ -62,14 +64,19 @@ public RelayBlockEntity(final BlockPos pos, final BlockState state) { this.outputNode = new RelayOutputNetworkNode( Platform.INSTANCE.getConfig().getRelay().getOutputNetworkEnergyUsage() ); - this.mainNode.setOutputNode(outputNode); + this.mainNetworkNode.setOutputNode(outputNode); this.filter = FilterWithFuzzyMode.createAndListenForUniqueFilters( ResourceContainerImpl.createForFilter(), this::setChanged, this::filterContainerChanged ); - this.mainNode.setFilterNormalizer(filter.createNormalizer()); - this.addContainer(new RelayOutputNetworkNodeContainer(this, outputNode)); + this.mainNetworkNode.setFilterNormalizer(filter.createNormalizer()); + this.containers.addContainer( + RefinedStorageApi.INSTANCE.createNetworkNodeContainer(this, outputNode) + .name("output") + .connectionStrategy(new RelayOutputConnectionStrategy(this)) + .build() + ); setRedstoneMode(RedstoneMode.LOW); } @@ -78,18 +85,18 @@ boolean isFuzzyMode() { } void setFuzzyMode(final boolean fuzzyMode) { - final boolean wasActive = mainNode.isActive(); + final boolean wasActive = mainNetworkNode.isActive(); // Updating fuzzy mode will call the filter's listener as the normalizer will yield different outputs. // However, when updating a filter the storage resets and "self-removes". If the normalizer yields different // outputs too early, the self-remove operation will partially fail as the expected resources will be different. // Therefore, we need to deactivate the node, update the fuzzy mode, and then reinitialize the node (ugly hack). - mainNode.setActive(false); + mainNetworkNode.setActive(false); filter.setFuzzyMode(fuzzyMode); - mainNode.setActive(wasActive); + mainNetworkNode.setActive(wasActive); } private void filterContainerChanged(final Set filters) { - mainNode.setFilters(filters); + mainNetworkNode.setFilters(filters); setChanged(); } @@ -99,7 +106,7 @@ int getPriority() { void setPriority(final int priority) { this.priority = priority; - this.mainNode.setPriority(priority); + this.mainNetworkNode.setPriority(priority); setChanged(); } @@ -109,7 +116,7 @@ AccessMode getAccessMode() { void setAccessMode(final AccessMode accessMode) { this.accessMode = accessMode; - mainNode.setAccessMode(accessMode); + mainNetworkNode.setAccessMode(accessMode); setChanged(); } @@ -119,34 +126,34 @@ FilterMode getFilterMode() { void setFilterMode(final FilterMode filterMode) { this.filterMode = filterMode; - mainNode.setFilterMode(filterMode); + mainNetworkNode.setFilterMode(filterMode); setChanged(); } boolean isPassEnergy() { - return mainNode.hasComponentType(RelayComponentType.ENERGY); + return mainNetworkNode.hasComponentType(RelayComponentType.ENERGY); } void setPassEnergy(final boolean passEnergy) { - mainNode.updateComponentType(RelayComponentType.ENERGY, passEnergy); + mainNetworkNode.updateComponentType(RelayComponentType.ENERGY, passEnergy); setChanged(); } boolean isPassStorage() { - return mainNode.hasComponentType(RelayComponentType.STORAGE); + return mainNetworkNode.hasComponentType(RelayComponentType.STORAGE); } void setPassStorage(final boolean passStorage) { - mainNode.updateComponentType(RelayComponentType.STORAGE, passStorage); + mainNetworkNode.updateComponentType(RelayComponentType.STORAGE, passStorage); setChanged(); } boolean isPassSecurity() { - return mainNode.hasComponentType(RelayComponentType.SECURITY); + return mainNetworkNode.hasComponentType(RelayComponentType.SECURITY); } void setPassSecurity(final boolean passSecurity) { - mainNode.updateComponentType(RelayComponentType.SECURITY, passSecurity); + mainNetworkNode.updateComponentType(RelayComponentType.SECURITY, passSecurity); setChanged(); } @@ -156,29 +163,32 @@ boolean isPassThrough() { void setPassThrough(final boolean passThrough) { this.passThrough = passThrough; - this.mainNode.setComponentTypes(Set.of()); + this.mainNetworkNode.setComponentTypes(Set.of()); setChanged(); - updateContainers(); + containers.update(level); } boolean isActiveInternal() { - return mainNode.isActive(); + return mainNetworkNode.isActive(); } Direction getDirectionInternal() { - return requireNonNull(getDirection()); + return requireNonNull(tryExtractDirection(getBlockState())); } @Override protected void activenessChanged(final boolean newActive) { super.activenessChanged(newActive); outputNode.setActive(newActive); - updateContainers(); + containers.update(level); } @Override - protected InWorldNetworkNodeContainer createMainContainer(final RelayInputNetworkNode node) { - return new RelayInputNetworkNodeContainer(this, node); + protected InWorldNetworkNodeContainer createMainContainer(final RelayInputNetworkNode networkNode) { + return RefinedStorageApi.INSTANCE.createNetworkNodeContainer(this, networkNode) + .name("input") + .connectionStrategy(new RelayInputConnectionStrategy(this)) + .build(); } @Override @@ -208,9 +218,9 @@ public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provide filter.save(tag, provider); tag.putInt(TAG_FILTER_MODE, FilterModeSettings.getFilterMode(filterMode)); tag.putBoolean(TAG_PASS_THROUGH, passThrough); - tag.putBoolean(TAG_PASS_ENERGY, mainNode.hasComponentType(RelayComponentType.ENERGY)); - tag.putBoolean(TAG_PASS_STORAGE, mainNode.hasComponentType(RelayComponentType.STORAGE)); - tag.putBoolean(TAG_PASS_SECURITY, mainNode.hasComponentType(RelayComponentType.SECURITY)); + tag.putBoolean(TAG_PASS_ENERGY, mainNetworkNode.hasComponentType(RelayComponentType.ENERGY)); + tag.putBoolean(TAG_PASS_STORAGE, mainNetworkNode.hasComponentType(RelayComponentType.STORAGE)); + tag.putBoolean(TAG_PASS_SECURITY, mainNetworkNode.hasComponentType(RelayComponentType.SECURITY)); tag.putInt(TAG_ACCESS_MODE, AccessModeSettings.getAccessMode(accessMode)); tag.putInt(TAG_PRIORITY, priority); } @@ -222,19 +232,19 @@ public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider if (tag.contains(TAG_FILTER_MODE)) { filterMode = FilterModeSettings.getFilterMode(tag.getInt(TAG_FILTER_MODE)); } - mainNode.setFilterMode(filterMode); + mainNetworkNode.setFilterMode(filterMode); if (tag.contains(TAG_PASS_THROUGH)) { passThrough = tag.getBoolean(TAG_PASS_THROUGH); } - mainNode.setComponentTypes(getComponentTypes(tag)); + mainNetworkNode.setComponentTypes(getComponentTypes(tag)); if (tag.contains(TAG_ACCESS_MODE)) { accessMode = AccessModeSettings.getAccessMode(tag.getInt(TAG_ACCESS_MODE)); } - mainNode.setAccessMode(accessMode); + mainNetworkNode.setAccessMode(accessMode); if (tag.contains(TAG_PRIORITY)) { priority = tag.getInt(TAG_PRIORITY); } - mainNode.setPriority(priority); + mainNetworkNode.setPriority(priority); } private Set getComponentTypes(final CompoundTag tag) { diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayInputNetworkNodeContainer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayInputConnectionStrategy.java similarity index 74% rename from refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayInputNetworkNodeContainer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayInputConnectionStrategy.java index b7bbfc560..cdea3d7fa 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayInputNetworkNodeContainer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayInputConnectionStrategy.java @@ -1,17 +1,15 @@ package com.refinedmods.refinedstorage.common.networking; -import com.refinedmods.refinedstorage.api.network.node.NetworkNode; import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; -import com.refinedmods.refinedstorage.common.support.network.InWorldNetworkNodeContainerImpl; +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionStrategy; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; -class RelayInputNetworkNodeContainer extends InWorldNetworkNodeContainerImpl { +class RelayInputConnectionStrategy implements ConnectionStrategy { private final RelayBlockEntity blockEntity; - RelayInputNetworkNodeContainer(final RelayBlockEntity blockEntity, final NetworkNode node) { - super(blockEntity, node, "input", 0, blockEntity, null); + RelayInputConnectionStrategy(final RelayBlockEntity blockEntity) { this.blockEntity = blockEntity; } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayOutputNetworkNodeContainer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayOutputConnectionStrategy.java similarity index 75% rename from refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayOutputNetworkNodeContainer.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayOutputConnectionStrategy.java index 060ac85d5..bee740f40 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayOutputNetworkNodeContainer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/RelayOutputConnectionStrategy.java @@ -1,17 +1,15 @@ package com.refinedmods.refinedstorage.common.networking; -import com.refinedmods.refinedstorage.api.network.impl.node.relay.RelayOutputNetworkNode; import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; -import com.refinedmods.refinedstorage.common.support.network.InWorldNetworkNodeContainerImpl; +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionStrategy; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; -class RelayOutputNetworkNodeContainer extends InWorldNetworkNodeContainerImpl { +class RelayOutputConnectionStrategy implements ConnectionStrategy { private final RelayBlockEntity blockEntity; - RelayOutputNetworkNodeContainer(final RelayBlockEntity blockEntity, final RelayOutputNetworkNode node) { - super(blockEntity, node, "output", 0, blockEntity, null); + RelayOutputConnectionStrategy(final RelayBlockEntity blockEntity) { this.blockEntity = blockEntity; } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/AbstractSecurityCardExtendedMenuProvider.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/AbstractSecurityCardExtendedMenuProvider.java index 5d6bbda48..16a19677f 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/AbstractSecurityCardExtendedMenuProvider.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/AbstractSecurityCardExtendedMenuProvider.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.common.security; import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; import com.refinedmods.refinedstorage.common.support.containermenu.ExtendedMenuProvider; @@ -19,7 +19,11 @@ abstract class AbstractSecurityCardExtendedMenuProvider implements ExtendedMe } protected final List getDataPermissions() { - return PlatformApi.INSTANCE.getPermissionRegistry().getAll().stream().map(this::toDataPermission).toList(); + return RefinedStorageApi.INSTANCE.getPermissionRegistry() + .getAll() + .stream() + .map(this::toDataPermission) + .toList(); } private SecurityCardData.Permission toDataPermission(final PlatformPermission permission) { diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/AbstractSecurityCardItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/AbstractSecurityCardItem.java index 5d3893f39..9315f03b6 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/AbstractSecurityCardItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/AbstractSecurityCardItem.java @@ -3,7 +3,7 @@ import com.refinedmods.refinedstorage.api.network.security.Permission; import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; import com.refinedmods.refinedstorage.common.api.security.SecurityPolicyContainerItem; import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; @@ -46,7 +46,7 @@ public void appendHoverText(final ItemStack stack, private void appendHoverText(final List lines, final SecurityPolicy policy, final Set dirtyPermissions) { - final List allPermissions = PlatformApi.INSTANCE.getPermissionRegistry().getAll(); + final List allPermissions = RefinedStorageApi.INSTANCE.getPermissionRegistry().getAll(); allPermissions.forEach(permission -> { final boolean allowed = policy.isAllowed(permission); final boolean dirty = dirtyPermissions.contains(permission); @@ -79,7 +79,7 @@ private void doUse(final InteractionHand hand, final ServerPlayer player, final final Set dirtyPermissions = getDirtyPermissions(stack); Platform.INSTANCE.getMenuOpener().openMenu(player, createMenuProvider( player.server, - PlatformApi.INSTANCE.createInventorySlotReference(player, hand), + RefinedStorageApi.INSTANCE.createInventorySlotReference(player, hand), policy, dirtyPermissions, stack @@ -107,14 +107,14 @@ public Optional getPolicy(final ItemStack stack) { } final SecurityCardPermissions permissions = stack.get(DataComponents.INSTANCE.getSecurityCardPermissions()); if (permissions == null) { - return Optional.of(PlatformApi.INSTANCE.createDefaultSecurityPolicy()); + return Optional.of(RefinedStorageApi.INSTANCE.createDefaultSecurityPolicy()); } return Optional.of(createPolicy(permissions)); } private SecurityPolicy createPolicy(final SecurityCardPermissions permissions) { final Set allowedPermissions = new HashSet<>(); - for (final PlatformPermission permission : PlatformApi.INSTANCE.getPermissionRegistry().getAll()) { + for (final PlatformPermission permission : RefinedStorageApi.INSTANCE.getPermissionRegistry().getAll()) { final boolean dirty = permissions.isDirty(permission); final boolean didExplicitlyAllow = dirty && permissions.isAllowed(permission); final boolean isAllowedByDefault = !dirty && permission.isAllowedByDefault(); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/BuiltinPermission.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/BuiltinPermission.java index f661fe064..9fb09b55c 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/BuiltinPermission.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/BuiltinPermission.java @@ -1,6 +1,5 @@ package com.refinedmods.refinedstorage.common.security; -import com.refinedmods.refinedstorage.common.api.security.BuiltinPermissions; import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; import com.refinedmods.refinedstorage.common.content.ContentNames; @@ -36,15 +35,6 @@ public enum BuiltinPermission implements PlatformPermission { */ SECURITY("security"); - public static final BuiltinPermissions VIEW = new BuiltinPermissions( - INSERT, - EXTRACT, - AUTOCRAFTING, - OPEN, - BUILD, - SECURITY - ); - private final ResourceLocation id; private final Component name; private final Component description; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardData.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardData.java index f7d81f912..4ec823502 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardData.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardData.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.security; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceFactory; @@ -18,7 +18,7 @@ public record SecurityCardData(SlotReference slotReference, List per ByteBufCodecs.collection( ArrayList::new, StreamCodec.composite( - PlatformApi.INSTANCE.getPermissionRegistry().streamCodec(), Permission::permission, + RefinedStorageApi.INSTANCE.getPermissionRegistry().streamCodec(), Permission::permission, ByteBufCodecs.BOOL, Permission::allowed, ByteBufCodecs.BOOL, Permission::dirty, Permission::new diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardPermissions.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardPermissions.java index b025dccab..26143f3fa 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardPermissions.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityCardPermissions.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.security; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; import java.util.Collections; @@ -16,7 +16,7 @@ public record SecurityCardPermissions(Map permissio public static final SecurityCardPermissions EMPTY = new SecurityCardPermissions(Collections.emptyMap()); public static final Codec CODEC = Codec.unboundedMap( - PlatformApi.INSTANCE.getPermissionRegistry().codec(), + RefinedStorageApi.INSTANCE.getPermissionRegistry().codec(), Codec.BOOL ).xmap(SecurityCardPermissions::new, SecurityCardPermissions::permissions); @@ -24,7 +24,7 @@ public record SecurityCardPermissions(Map permissio .composite( ByteBufCodecs.map( HashMap::new, - PlatformApi.INSTANCE.getPermissionRegistry().streamCodec(), + RefinedStorageApi.INSTANCE.getPermissionRegistry().streamCodec(), ByteBufCodecs.BOOL ), SecurityCardPermissions::permissions, SecurityCardPermissions::new diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityManagerBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityManagerBlockEntity.java index 346090ea4..0efa12921 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityManagerBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityManagerBlockEntity.java @@ -3,21 +3,23 @@ import com.refinedmods.refinedstorage.api.network.impl.node.security.SecurityDecisionProviderProxyNetworkNode; import com.refinedmods.refinedstorage.api.network.impl.security.SecurityDecisionProviderImpl; import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.security.SecurityHelper; import com.refinedmods.refinedstorage.common.api.security.SecurityPolicyContainerItem; -import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; import com.refinedmods.refinedstorage.common.content.BlockEntities; import com.refinedmods.refinedstorage.common.content.ContentNames; import com.refinedmods.refinedstorage.common.support.BlockEntityWithDrops; import com.refinedmods.refinedstorage.common.support.FilteredContainer; import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeMenuProvider; import com.refinedmods.refinedstorage.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.support.network.NetworkNodeContainerProviderImpl; import com.refinedmods.refinedstorage.common.util.ContainerUtil; import javax.annotation.Nullable; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; @@ -57,9 +59,27 @@ public SecurityManagerBlockEntity(final BlockPos pos, final BlockState state) { Platform.INSTANCE.getConfig().getSecurityManager().getEnergyUsage() ) ); - securityCards.addListener(c -> invalidate()); - fallbackSecurityCard.addListener(c -> invalidate()); - mainNode.setDelegate(securityDecisionProvider); + securityCards.addListener(card -> invalidate()); + fallbackSecurityCard.addListener(card -> invalidate()); + mainNetworkNode.setDelegate(securityDecisionProvider); + } + + @Override + protected NetworkNodeContainerProvider createContainerProvider() { + return new NetworkNodeContainerProviderImpl() { + @Override + public boolean canBuild(final ServerPlayer player) { + return super.canBuild(player) || isPlacedBy(player.getGameProfile().getId()); + } + }; + } + + @Override + protected InWorldNetworkNodeContainer createMainContainer( + final SecurityDecisionProviderProxyNetworkNode networkNode) { + return RefinedStorageApi.INSTANCE.createNetworkNodeContainer(this, networkNode) + .connectionStrategy(new SecurityManagerConnectionStrategy(this::getBlockState, getBlockPos())) + .build(); } private void invalidate() { @@ -79,7 +99,7 @@ private void invalidate() { actor -> securityDecisionProvider.setPolicy(actor, policy))); } energyUsage += updateDefaultPolicyAndGetEnergyUsage(); - mainNode.setEnergyUsage(energyUsage); + mainNetworkNode.setEnergyUsage(energyUsage); } private long updateDefaultPolicyAndGetEnergyUsage() { @@ -155,30 +175,7 @@ public AbstractContainerMenu createMenu(final int syncId, final Inventory invent @Override public boolean canOpen(final ServerPlayer player) { final boolean isAllowedViaSecuritySystem = NetworkNodeMenuProvider.super.canOpen(player) - && SecurityHelper.isAllowed(player, BuiltinPermission.SECURITY, getContainers()); + && SecurityHelper.isAllowed(player, BuiltinPermission.SECURITY, containers.getContainers()); return isAllowedViaSecuritySystem || isPlacedBy(player.getGameProfile().getId()); } - - @Override - public boolean canBuild(final ServerPlayer player) { - return super.canBuild(player) || isPlacedBy(player.getGameProfile().getId()); - } - - @Override - public void addOutgoingConnections(final ConnectionSink sink) { - for (final Direction direction : Direction.values()) { - if (direction == Direction.UP) { - continue; - } - sink.tryConnectInSameDimension(worldPosition.relative(direction), direction.getOpposite()); - } - } - - @Override - public boolean canAcceptIncomingConnection(final Direction incomingDirection, final BlockState connectingState) { - if (!colorsAllowConnecting(connectingState)) { - return false; - } - return incomingDirection != Direction.UP; - } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityManagerConnectionStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityManagerConnectionStrategy.java new file mode 100644 index 000000000..ff3c70486 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/security/SecurityManagerConnectionStrategy.java @@ -0,0 +1,34 @@ +package com.refinedmods.refinedstorage.common.security; + +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.common.support.network.ColoredConnectionStrategy; + +import java.util.function.Supplier; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.level.block.state.BlockState; + +class SecurityManagerConnectionStrategy extends ColoredConnectionStrategy { + SecurityManagerConnectionStrategy(final Supplier blockStateProvider, final BlockPos origin) { + super(blockStateProvider, origin); + } + + @Override + public void addOutgoingConnections(final ConnectionSink sink) { + for (final Direction direction : Direction.values()) { + if (direction == Direction.UP) { + continue; + } + sink.tryConnectInSameDimension(origin.relative(direction), direction.getOpposite()); + } + } + + @Override + public boolean canAcceptIncomingConnection(final Direction incomingDirection, final BlockState connectingState) { + if (!colorsAllowConnecting(connectingState)) { + return false; + } + return incomingDirection != Direction.UP; + } +} diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AbstractDiskContainerBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AbstractDiskContainerBlockEntity.java index 980de5237..d56946f89 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AbstractDiskContainerBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/AbstractDiskContainerBlockEntity.java @@ -2,7 +2,7 @@ import com.refinedmods.refinedstorage.api.network.impl.node.AbstractStorageContainerNetworkNode; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock; import com.refinedmods.refinedstorage.common.support.BlockEntityWithDrops; import com.refinedmods.refinedstorage.common.support.FilterWithFuzzyMode; @@ -51,17 +51,22 @@ protected AbstractDiskContainerBlockEntity(final BlockEntityType type, final BlockState state, final T node) { super(type, pos, state, node); - this.diskInventory = new DiskInventory((inventory, slot) -> onDiskChanged(slot), mainNode.getSize()); + this.diskInventory = new DiskInventory((inventory, slot) -> onDiskChanged(slot), mainNetworkNode.getSize()); this.filter = FilterWithFuzzyMode.createAndListenForUniqueFilters( ResourceContainerImpl.createForFilter(), this::setChanged, this::setFilters ); - this.mainNode.setListener(diskStateListener); + this.mainNetworkNode.setListener(diskStateListener); setNormalizer(filter.createNormalizer()); + } + + @Override + protected void containerInitialized() { + super.containerInitialized(); // It's important to sync here as the initial update packet might have failed as the network // could possibly be not initialized yet. - this.initializationCallback = diskStateListener::immediateUpdate; + diskStateListener.immediateUpdate(); } protected abstract void setFilters(Set filters); @@ -113,8 +118,8 @@ public void setChanged() { } private void initialize(final Level level) { - diskInventory.setStorageRepository(PlatformApi.INSTANCE.getStorageRepository(level)); - mainNode.setProvider(diskInventory); + diskInventory.setStorageRepository(RefinedStorageApi.INSTANCE.getStorageRepository(level)); + mainNetworkNode.setProvider(diskInventory); } @Override @@ -158,11 +163,11 @@ private void onDiskChanged(final int slot) { // Level will not yet be present final boolean isJustPlacedIntoLevelOrLoading = level == null || level.isClientSide(); // Level will be present, but network not yet - final boolean isPlacedThroughDismantlingMode = mainNode.getNetwork() == null; + final boolean isPlacedThroughDismantlingMode = mainNetworkNode.getNetwork() == null; if (isJustPlacedIntoLevelOrLoading || isPlacedThroughDismantlingMode) { return; } - mainNode.onStorageChanged(slot); + mainNetworkNode.onStorageChanged(slot); diskStateListener.immediateUpdate(); setChanged(); } @@ -188,10 +193,10 @@ public Packet getUpdatePacket() { public CompoundTag getUpdateTag(final HolderLookup.Provider provider) { final CompoundTag tag = new CompoundTag(); // This null check is important. #getUpdateTag() can be called before the node's network is initialized! - if (mainNode.getNetwork() == null) { + if (mainNetworkNode.getNetwork() == null) { return tag; } - tag.put(TAG_DISKS, diskInventory.toSyncTag(mainNode::getState)); + tag.put(TAG_DISKS, diskInventory.toSyncTag(mainNetworkNode::getState)); return tag; } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageContainerItemHelperImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageContainerItemHelperImpl.java index c5bf85c0a..891288483 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageContainerItemHelperImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/StorageContainerItemHelperImpl.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.storage; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.storage.SerializableStorage; import com.refinedmods.refinedstorage.common.api.storage.StorageBlockEntity; import com.refinedmods.refinedstorage.common.api.storage.StorageContainerItemHelper; @@ -81,7 +81,7 @@ public InteractionResultHolder tryDisassembly(final Level level, } return storageId - .flatMap(id -> PlatformApi.INSTANCE.getStorageRepository(level).removeIfEmpty(id)) + .flatMap(id -> RefinedStorageApi.INSTANCE.getStorageRepository(level).removeIfEmpty(id)) .map(disk -> returnByproducts(level, player, primaryByproduct, secondaryByproduct)) .orElseGet(() -> InteractionResultHolder.fail(stack)); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java index 66bfa0378..d315ff0e7 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java @@ -32,7 +32,7 @@ protected AbstractDiskDriveBlockEntity(final BlockPos pos, final BlockState stat AMOUNT_OF_DISKS )); this.configContainer = new StorageConfigurationContainerImpl( - mainNode.getStorageConfiguration(), + mainNetworkNode.getStorageConfiguration(), filter, this::setChanged, this::getRedstoneMode, @@ -42,12 +42,12 @@ protected AbstractDiskDriveBlockEntity(final BlockPos pos, final BlockState stat @Override protected void setFilters(final Set filters) { - mainNode.getStorageConfiguration().setFilters(filters); + mainNetworkNode.getStorageConfiguration().setFilters(filters); } @Override protected void setNormalizer(final UnaryOperator normalizer) { - mainNode.getStorageConfiguration().setNormalizer(normalizer); + mainNetworkNode.getStorageConfiguration().setNormalizer(normalizer); } @Override diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/DiskDriveContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/DiskDriveContainerMenu.java index bcce73acb..9c354940a 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/DiskDriveContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskdrive/DiskDriveContainerMenu.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.storage.diskdrive; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.storage.StorageContainerItem; import com.refinedmods.refinedstorage.common.api.storage.StorageInfo; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; @@ -42,7 +42,9 @@ public DiskDriveContainerMenu(final int syncId, final Inventory playerInventory, final ResourceContainerData resourceContainerData) { super(Menus.INSTANCE.getDiskDrive(), syncId); - this.storageInfoAccessor = new StorageDiskInfoAccessorImpl(PlatformApi.INSTANCE.getClientStorageRepository()); + this.storageInfoAccessor = new StorageDiskInfoAccessorImpl( + RefinedStorageApi.INSTANCE.getClientStorageRepository() + ); addSlots( playerInventory.player, new FilteredContainer( diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java index 8fa8b76dc..29e6cada4 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java @@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.storage.SerializableStorage; import com.refinedmods.refinedstorage.common.content.BlockEntities; import com.refinedmods.refinedstorage.common.content.ContentNames; @@ -54,11 +54,11 @@ protected AbstractDiskInterfaceBlockEntity(final BlockPos pos, final BlockState )); this.upgradeContainer = new UpgradeContainer( UpgradeDestinations.DISK_INTERFACE, - PlatformApi.INSTANCE.getUpgradeRegistry(), + RefinedStorageApi.INSTANCE.getUpgradeRegistry(), this::upgradeContainerChanged ); - this.mainNode.setListener(this); - this.mainNode.setTransferQuotaProvider(storage -> { + this.mainNetworkNode.setListener(this); + this.mainNetworkNode.setTransferQuotaProvider(storage -> { if (storage instanceof SerializableStorage serializableStorage) { return serializableStorage.getType().getDiskInterfaceTransferQuota( upgradeContainer.has(Items.INSTANCE.getStackUpgrade()) @@ -72,7 +72,7 @@ private void upgradeContainerChanged() { final int amountOfSpeedUpgrades = upgradeContainer.getAmount(Items.INSTANCE.getSpeedUpgrade()); this.workTickRate = 9 - (amountOfSpeedUpgrades * 2); final long baseEnergyUsage = Platform.INSTANCE.getConfig().getDiskInterface().getEnergyUsage(); - mainNode.setEnergyUsage(baseEnergyUsage + upgradeContainer.getEnergyUsage()); + mainNetworkNode.setEnergyUsage(baseEnergyUsage + upgradeContainer.getEnergyUsage()); setChanged(); } @@ -85,12 +85,12 @@ public final void doWork() { @Override protected void setFilters(final Set filters) { - mainNode.setFilters(filters); + mainNetworkNode.setFilters(filters); } @Override protected void setNormalizer(final UnaryOperator normalizer) { - mainNode.setNormalizer(normalizer); + mainNetworkNode.setNormalizer(normalizer); } @Override @@ -105,24 +105,24 @@ public void loadAdditional(final CompoundTag tag, final HolderLookup.Provider pr public void saveAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { super.saveAdditional(tag, provider); tag.put(TAG_UPGRADES, ContainerUtil.write(upgradeContainer, provider)); - tag.putInt(TAG_FILTER_MODE, FilterModeSettings.getFilterMode(mainNode.getFilterMode())); + tag.putInt(TAG_FILTER_MODE, FilterModeSettings.getFilterMode(mainNetworkNode.getFilterMode())); } @Override public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { super.readConfiguration(tag, provider); if (tag.contains(TAG_TRANSFER_MODE)) { - mainNode.setMode(TransferModeSettings.getTransferMode(tag.getInt(TAG_TRANSFER_MODE))); + mainNetworkNode.setMode(TransferModeSettings.getTransferMode(tag.getInt(TAG_TRANSFER_MODE))); } if (tag.contains(TAG_FILTER_MODE)) { - mainNode.setFilterMode(FilterModeSettings.getFilterMode(tag.getInt(TAG_FILTER_MODE))); + mainNetworkNode.setFilterMode(FilterModeSettings.getFilterMode(tag.getInt(TAG_FILTER_MODE))); } } @Override public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { super.writeConfiguration(tag, provider); - tag.putInt(TAG_TRANSFER_MODE, TransferModeSettings.getTransferMode(mainNode.getMode())); + tag.putInt(TAG_TRANSFER_MODE, TransferModeSettings.getTransferMode(mainNetworkNode.getMode())); } @Override @@ -171,20 +171,20 @@ void setFuzzyMode(final boolean fuzzyMode) { } FilterMode getFilterMode() { - return mainNode.getFilterMode(); + return mainNetworkNode.getFilterMode(); } void setFilterMode(final FilterMode mode) { - mainNode.setFilterMode(mode); + mainNetworkNode.setFilterMode(mode); setChanged(); } public StorageTransferMode getTransferMode() { - return mainNode.getMode(); + return mainNetworkNode.getMode(); } public void setTransferMode(final StorageTransferMode mode) { - mainNode.setMode(mode); + mainNetworkNode.setMode(mode); setChanged(); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/DiskInterfaceContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/DiskInterfaceContainerMenu.java index 8958fd785..facd010d9 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/DiskInterfaceContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/DiskInterfaceContainerMenu.java @@ -2,7 +2,7 @@ import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferMode; import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.storage.StorageContainerItem; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; import com.refinedmods.refinedstorage.common.content.Menus; @@ -77,7 +77,7 @@ public DiskInterfaceContainerMenu(final int syncId, StorageContainerItem.stackValidator() ), ResourceContainerImpl.createForFilter(resourceContainerData), - new UpgradeContainer(UpgradeDestinations.DISK_INTERFACE, PlatformApi.INSTANCE.getUpgradeRegistry()) + new UpgradeContainer(UpgradeDestinations.DISK_INTERFACE, RefinedStorageApi.INSTANCE.getUpgradeRegistry()) ); registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); registerProperty(new ClientProperty<>(PropertyTypes.FUZZY_MODE, false)); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageBlockEntity.java index 6229a5af0..580c8ea61 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageBlockEntity.java @@ -2,7 +2,7 @@ import com.refinedmods.refinedstorage.api.network.impl.node.externalstorage.ExternalStorageNetworkNode; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.content.BlockEntities; import com.refinedmods.refinedstorage.common.content.ContentNames; import com.refinedmods.refinedstorage.common.storage.StorageConfigurationContainerImpl; @@ -30,6 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock.tryExtractDirection; import static java.util.Objects.requireNonNull; public class ExternalStorageBlockEntity @@ -53,12 +54,12 @@ public ExternalStorageBlockEntity(final BlockPos pos, final BlockState state) { this.filter = FilterWithFuzzyMode.createAndListenForUniqueFilters( ResourceContainerImpl.createForFilter(), this::setChanged, - mainNode.getStorageConfiguration()::setFilters + mainNetworkNode.getStorageConfiguration()::setFilters ); - mainNode.getStorageConfiguration().setNormalizer(filter.createNormalizer()); - mainNode.setTrackingRepository(trackedStorageRepository); + mainNetworkNode.getStorageConfiguration().setNormalizer(filter.createNormalizer()); + mainNetworkNode.setTrackingRepository(trackedStorageRepository); this.configContainer = new StorageConfigurationContainerImpl( - mainNode.getStorageConfiguration(), + mainNetworkNode.getStorageConfiguration(), filter, this::setChanged, this::getRedstoneMode, @@ -86,15 +87,15 @@ protected void activenessChanged(final boolean newActive) { } void loadStorage(final ServerLevel serverLevel) { - final Direction direction = getDirection(); + final Direction direction = tryExtractDirection(getBlockState()); LOGGER.debug("Loading storage for external storage with direction {} @ {}", direction, worldPosition); if (direction == null) { return; } - mainNode.initialize(() -> { + mainNetworkNode.initialize(() -> { final Direction incomingDirection = direction.getOpposite(); final BlockPos sourcePosition = worldPosition.relative(direction); - return PlatformApi.INSTANCE + return RefinedStorageApi.INSTANCE .getExternalStorageProviderFactories() .stream() .flatMap(factory -> factory.create(serverLevel, sourcePosition, incomingDirection).stream()) @@ -106,7 +107,7 @@ void loadStorage(final ServerLevel serverLevel) { public void doWork() { super.doWork(); if (workRate.canDoWork()) { - final boolean hasChanges = mainNode.detectChanges(); + final boolean hasChanges = mainNetworkNode.detectChanges(); if (hasChanges) { LOGGER.debug("External storage @ {} has changed!", worldPosition); workRate.faster(); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/AbstractPortableGridBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/AbstractPortableGridBlockEntity.java index 02c937fd2..b00adf832 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/AbstractPortableGridBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/AbstractPortableGridBlockEntity.java @@ -3,7 +3,7 @@ import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage.api.network.impl.energy.EnergyStorageImpl; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.configurationcard.ConfigurationCardTarget; import com.refinedmods.refinedstorage.common.api.grid.Grid; import com.refinedmods.refinedstorage.common.api.support.energy.TransferableBlockEntityEnergy; @@ -151,7 +151,7 @@ public void setLevel(final Level level) { } private void initialize(final Level level) { - diskInventory.setStorageRepository(PlatformApi.INSTANCE.getStorageRepository(level)); + diskInventory.setStorageRepository(RefinedStorageApi.INSTANCE.getStorageRepository(level)); grid.updateStorage(); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridBlockItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridBlockItem.java index 59fbce896..5ce20f07b 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridBlockItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGridBlockItem.java @@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.api.storage.StateTrackedStorage; import com.refinedmods.refinedstorage.api.storage.StorageState; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.storage.StorageContainerItem; import com.refinedmods.refinedstorage.common.api.storage.StorageRepository; import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; @@ -45,7 +45,7 @@ public class PortableGridBlockItem extends AbstractEnergyBlockItem implements Sl private final PortableGridType type; public PortableGridBlockItem(final Block block, final PortableGridType type) { - super(block, new Item.Properties().stacksTo(1), PlatformApi.INSTANCE.getEnergyItemHelper()); + super(block, new Item.Properties().stacksTo(1), RefinedStorageApi.INSTANCE.getEnergyItemHelper()); this.type = type; } @@ -73,7 +73,7 @@ private static StorageState getState(final ItemStack diskStack, final boolean ac if (!active) { return StorageState.INACTIVE; } - final StorageRepository storageRepository = PlatformApi.INSTANCE.getClientStorageRepository(); + final StorageRepository storageRepository = RefinedStorageApi.INSTANCE.getClientStorageRepository(); return storageContainerItem.getInfo(storageRepository, diskStack) .map(storageInfo -> StateTrackedStorage.computeState(storageInfo.capacity(), storageInfo.stored())) .orElse(StorageState.INACTIVE); @@ -105,7 +105,7 @@ public static EnergyStorage createEnergyStorage(final ItemStack stack) { final EnergyStorage energyStorage = new EnergyStorageImpl( Platform.INSTANCE.getConfig().getPortableGrid().getEnergyCapacity() ); - return PlatformApi.INSTANCE.asBlockItemEnergyStorage( + return RefinedStorageApi.INSTANCE.asBlockItemEnergyStorage( energyStorage, stack, BlockEntities.INSTANCE.getPortableGrid() @@ -116,7 +116,7 @@ public static EnergyStorage createEnergyStorage(final ItemStack stack) { public InteractionResultHolder use(final Level level, final Player player, final InteractionHand hand) { final ItemStack stack = player.getItemInHand(hand); if (player instanceof ServerPlayer serverPlayer && level.getServer() != null) { - final SlotReference slotReference = PlatformApi.INSTANCE.createInventorySlotReference(player, hand); + final SlotReference slotReference = RefinedStorageApi.INSTANCE.createInventorySlotReference(player, hand); slotReference.resolve(player).ifPresent(s -> use(serverPlayer, s, slotReference)); } return InteractionResultHolder.consume(stack); @@ -128,7 +128,7 @@ public void use(final ServerPlayer player, final ItemStack stack, final SlotRefe final Level level = player.serverLevel(); final DiskInventoryListenerImpl listener = new DiskInventoryListenerImpl(stack, level.registryAccess()); final DiskInventory diskInventory = createDiskInventory(stack, listener, level.registryAccess()); - diskInventory.setStorageRepository(PlatformApi.INSTANCE.getStorageRepository(level)); + diskInventory.setStorageRepository(RefinedStorageApi.INSTANCE.getStorageRepository(level)); final PortableGrid portableGrid = new PortableGrid( energyStorage, diskInventory, diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/AbstractStorageBlockBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/AbstractStorageBlockBlockEntity.java index 84e1c914b..1b5e2cb82 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/AbstractStorageBlockBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/AbstractStorageBlockBlockEntity.java @@ -3,7 +3,7 @@ import com.refinedmods.refinedstorage.api.network.impl.node.AbstractStorageContainerNetworkNode; import com.refinedmods.refinedstorage.api.network.impl.node.storage.StorageNetworkNode; import com.refinedmods.refinedstorage.api.storage.Storage; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.storage.SerializableStorage; import com.refinedmods.refinedstorage.common.api.storage.StorageBlockEntity; import com.refinedmods.refinedstorage.common.api.storage.StorageRepository; @@ -54,16 +54,16 @@ protected AbstractStorageBlockBlockEntity(final BlockEntityType type, this.filter = FilterWithFuzzyMode.createAndListenForUniqueFilters( ResourceContainerImpl.createForFilter(resourceFactory), this::setChanged, - mainNode.getStorageConfiguration()::setFilters + mainNetworkNode.getStorageConfiguration()::setFilters ); this.configContainer = new StorageConfigurationContainerImpl( - mainNode.getStorageConfiguration(), + mainNetworkNode.getStorageConfiguration(), filter, this::setChanged, this::getRedstoneMode, this::setRedstoneMode ); - mainNode.getStorageConfiguration().setNormalizer(filter.createNormalizer()); + mainNetworkNode.getStorageConfiguration().setNormalizer(filter.createNormalizer()); } protected abstract SerializableStorage createStorage(Runnable listener); @@ -82,11 +82,11 @@ public void setLevel(final Level level) { // (#setLevel(Level) -> #modifyStorageAfterAlreadyInitialized(UUID)). // In both cases listed above we need to clean up the storage we create here. storageId = UUID.randomUUID(); - final StorageRepository storageRepository = PlatformApi.INSTANCE.getStorageRepository(level); + final StorageRepository storageRepository = RefinedStorageApi.INSTANCE.getStorageRepository(level); final SerializableStorage storage = createStorage(storageRepository::markAsChanged); storageRepository.set(storageId, storage); } - mainNode.setProvider(this); + mainNetworkNode.setProvider(this); } @Override @@ -123,7 +123,7 @@ public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provide public void setStorageId(final UUID storageId) { tryRemoveCurrentStorage(storageId); this.storageId = storageId; - mainNode.onStorageChanged(0); + mainNetworkNode.onStorageChanged(0); } private void tryRemoveCurrentStorage(final UUID newStorageId) { @@ -134,7 +134,7 @@ private void tryRemoveCurrentStorage(final UUID newStorageId) { // we got placed with an existing storage ID (#setLevel(Level) -> #setStorageId(UUID)). // Clean up the storage created earlier in #setLevel(Level). LOGGER.info("Updating storage ID from {} to {}. Removing old storage", storageId, newStorageId); - final StorageRepository storageRepository = PlatformApi.INSTANCE.getStorageRepository(level); + final StorageRepository storageRepository = RefinedStorageApi.INSTANCE.getStorageRepository(level); storageRepository.removeIfEmpty(storageId).ifPresentOrElse( storage -> LOGGER.info("Storage {} successfully removed", storageId), () -> LOGGER.warn("Storage {} could not be removed", storageId) @@ -154,8 +154,8 @@ protected final ResourceContainer getFilterContainer() { @Override public StorageBlockData getMenuData() { return new StorageBlockData( - mainNode.getStored(), - mainNode.getCapacity(), + mainNetworkNode.getStored(), + mainNetworkNode.getCapacity(), ResourceContainerData.of(filter.getFilterContainer()) ); } @@ -170,7 +170,7 @@ public Optional resolve(final int index) { if (level == null || storageId == null) { return Optional.empty(); } - final StorageRepository storageRepository = PlatformApi.INSTANCE.getStorageRepository(level); + final StorageRepository storageRepository = RefinedStorageApi.INSTANCE.getStorageRepository(level); return storageRepository.get(storageId).map(Storage.class::cast); } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockBlockEntity.java index 308fefb46..675d27996 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockBlockEntity.java @@ -2,7 +2,7 @@ import com.refinedmods.refinedstorage.api.network.impl.node.storage.StorageNetworkNode; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.storage.SerializableStorage; import com.refinedmods.refinedstorage.common.content.BlockEntities; import com.refinedmods.refinedstorage.common.storage.FluidStorageVariant; @@ -29,7 +29,7 @@ public FluidStorageBlockBlockEntity(final BlockPos pos, pos, state, new StorageNetworkNode(getEnergyUsage(variant), 0, 1), - PlatformApi.INSTANCE.getFluidResourceFactory() + RefinedStorageApi.INSTANCE.getFluidResourceFactory() ); this.variant = variant; this.displayName = createTranslation( diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockBlockItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockBlockItem.java index 55790a862..7c334447c 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockBlockItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockBlockItem.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.storage.storageblock; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.storage.AbstractStorageContainerBlockItem; import com.refinedmods.refinedstorage.common.api.support.AmountFormatting; import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; @@ -33,7 +33,7 @@ public FluidStorageBlockBlockItem(final Block block, final FluidStorageVariant v super( block, new Item.Properties().stacksTo(1).fireResistant(), - PlatformApi.INSTANCE.getStorageContainerItemHelper() + RefinedStorageApi.INSTANCE.getStorageContainerItemHelper() ); this.variant = variant; this.helpText = getHelpText(variant); @@ -76,8 +76,11 @@ protected ItemStack createSecondaryDisassemblyByproduct(final int count) { @Override protected boolean placeBlock(final BlockPlaceContext ctx, final BlockState state) { - if (ctx.getPlayer() instanceof ServerPlayer serverPlayer - && !(PlatformApi.INSTANCE.canPlaceNetworkNode(serverPlayer, ctx.getLevel(), ctx.getClickedPos(), state))) { + if (ctx.getPlayer() instanceof ServerPlayer serverPlayer && !(RefinedStorageApi.INSTANCE.canPlaceNetworkNode( + serverPlayer, + ctx.getLevel(), + ctx.getClickedPos(), + state))) { return false; } return super.placeBlock(ctx, state); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockContainerMenu.java index fdea5882c..bc34a5dd2 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/FluidStorageBlockContainerMenu.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.storage.storageblock; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; import com.refinedmods.refinedstorage.common.content.Menus; import com.refinedmods.refinedstorage.common.storage.StorageConfigurationContainer; @@ -17,7 +17,7 @@ public FluidStorageBlockContainerMenu(final int syncId, syncId, playerInventory.player, storageBlockData, - PlatformApi.INSTANCE.getFluidResourceFactory() + RefinedStorageApi.INSTANCE.getFluidResourceFactory() ); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockBlockEntity.java index 840f5be16..4c2507d88 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockBlockEntity.java @@ -2,7 +2,7 @@ import com.refinedmods.refinedstorage.api.network.impl.node.storage.StorageNetworkNode; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.storage.SerializableStorage; import com.refinedmods.refinedstorage.common.content.BlockEntities; import com.refinedmods.refinedstorage.common.storage.ItemStorageVariant; @@ -29,7 +29,7 @@ public ItemStorageBlockBlockEntity(final BlockPos pos, pos, state, new StorageNetworkNode(getEnergyUsage(variant), 0, 1), - PlatformApi.INSTANCE.getItemResourceFactory() + RefinedStorageApi.INSTANCE.getItemResourceFactory() ); this.variant = variant; this.displayName = createTranslation("block", String.format("%s_storage_block", variant.getName())); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockBlockItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockBlockItem.java index 2e1be41b5..99cdb125a 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockBlockItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockBlockItem.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.storage.storageblock; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.storage.AbstractStorageContainerBlockItem; import com.refinedmods.refinedstorage.common.api.support.AmountFormatting; import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; @@ -32,7 +32,7 @@ public ItemStorageBlockBlockItem(final Block block, final ItemStorageVariant var super( block, new Item.Properties().stacksTo(1).fireResistant(), - PlatformApi.INSTANCE.getStorageContainerItemHelper() + RefinedStorageApi.INSTANCE.getStorageContainerItemHelper() ); this.variant = variant; this.helpText = variant.getCapacity() == null @@ -66,8 +66,12 @@ protected ItemStack createSecondaryDisassemblyByproduct(final int count) { @Override protected boolean placeBlock(final BlockPlaceContext ctx, final BlockState state) { - if (ctx.getPlayer() instanceof ServerPlayer serverPlayer - && !(PlatformApi.INSTANCE.canPlaceNetworkNode(serverPlayer, ctx.getLevel(), ctx.getClickedPos(), state))) { + if (ctx.getPlayer() instanceof ServerPlayer serverPlayer && !(RefinedStorageApi.INSTANCE.canPlaceNetworkNode( + serverPlayer, + ctx.getLevel(), + ctx.getClickedPos(), + state + ))) { return false; } return super.placeBlock(ctx, state); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockContainerMenu.java index 366b57b45..b192a82b2 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/ItemStorageBlockContainerMenu.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.storage.storageblock; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; import com.refinedmods.refinedstorage.common.content.Menus; import com.refinedmods.refinedstorage.common.storage.StorageConfigurationContainer; @@ -17,7 +17,7 @@ public ItemStorageBlockContainerMenu(final int syncId, syncId, playerInventory.player, storageBlockData, - PlatformApi.INSTANCE.getItemResourceFactory() + RefinedStorageApi.INSTANCE.getItemResourceFactory() ); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/StorageBlockLootItemFunction.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/StorageBlockLootItemFunction.java index b37b4ae25..15e2c65b3 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/StorageBlockLootItemFunction.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storageblock/StorageBlockLootItemFunction.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.storage.storageblock; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.storage.StorageBlockEntity; import com.refinedmods.refinedstorage.common.content.LootFunctions; @@ -21,7 +21,7 @@ public LootItemFunctionType getType() { public ItemStack apply(final ItemStack stack, final LootContext lootContext) { final BlockEntity blockEntity = lootContext.getParam(LootContextParams.BLOCK_ENTITY); if (blockEntity instanceof StorageBlockEntity transferable) { - PlatformApi.INSTANCE.getStorageContainerItemHelper().transferFromBlockEntity(stack, transferable); + RefinedStorageApi.INSTANCE.getStorageContainerItemHelper().transferFromBlockEntity(stack, transferable); } return stack; } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storagedisk/FluidStorageDiskItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storagedisk/FluidStorageDiskItem.java index b8d6c35e7..7a76aa02a 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storagedisk/FluidStorageDiskItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storagedisk/FluidStorageDiskItem.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.storage.storagedisk; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.storage.AbstractStorageContainerItem; import com.refinedmods.refinedstorage.common.api.storage.SerializableStorage; import com.refinedmods.refinedstorage.common.api.storage.StorageRepository; @@ -30,7 +30,7 @@ public class FluidStorageDiskItem extends AbstractStorageContainerItem { public FluidStorageDiskItem(final FluidStorageVariant variant) { super( new Item.Properties().stacksTo(1).fireResistant(), - PlatformApi.INSTANCE.getStorageContainerItemHelper() + RefinedStorageApi.INSTANCE.getStorageContainerItemHelper() ); this.variant = variant; this.helpText = getHelpText(variant); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storagedisk/ItemStorageDiskItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storagedisk/ItemStorageDiskItem.java index f12be35e6..8b72454ee 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storagedisk/ItemStorageDiskItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/storagedisk/ItemStorageDiskItem.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.storage.storagedisk; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.storage.AbstractStorageContainerItem; import com.refinedmods.refinedstorage.common.api.storage.SerializableStorage; import com.refinedmods.refinedstorage.common.api.storage.StorageRepository; @@ -29,7 +29,7 @@ public class ItemStorageDiskItem extends AbstractStorageContainerItem { public ItemStorageDiskItem(final ItemStorageVariant variant) { super( new Item.Properties().stacksTo(1).fireResistant(), - PlatformApi.INSTANCE.getStorageContainerItemHelper() + RefinedStorageApi.INSTANCE.getStorageContainerItemHelper() ); this.variant = variant; this.helpText = variant.getCapacity() == null diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlockEntity.java index adb894b73..443fd19d2 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlockEntity.java @@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.storage.PlayerActor; import com.refinedmods.refinedstorage.common.api.storage.root.FuzzyRootStorage; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; @@ -81,7 +81,7 @@ public void doWork() { private void trySendDisplayUpdate(final Level level) { final long amount = getAmount(); - final boolean active = mainNode.isActive(); + final boolean active = mainNetworkNode.isActive(); if ((amount != currentAmount || active != currentlyActive) && displayUpdateRateLimiter.tryAcquire()) { sendDisplayUpdate(level, amount, active); } @@ -92,7 +92,7 @@ private long getAmount() { if (configuredResource == null) { return 0; } - final Network network = mainNode.getNetwork(); + final Network network = mainNetworkNode.getNetwork(); if (network == null) { return 0; } @@ -111,7 +111,7 @@ public void extract(final Player player) { if (level == null) { return; } - final Network network = mainNode.getNetwork(); + final Network network = mainNetworkNode.getNetwork(); if (network == null) { return; } @@ -128,7 +128,7 @@ private void doExtract( final ResourceKey configuredResource, final Network network ) { - final boolean success = PlatformApi.INSTANCE.getStorageMonitorExtractionStrategy().extract( + final boolean success = RefinedStorageApi.INSTANCE.getStorageMonitorExtractionStrategy().extract( configuredResource, !player.isShiftKeyDown(), player, @@ -156,7 +156,7 @@ public void insert(final Player player, final InteractionHand hand) { } private boolean doInsert(final Player player, final InteractionHand hand) { - final Network network = mainNode.getNetwork(); + final Network network = mainNetworkNode.getNetwork(); if (network == null) { return false; } @@ -178,7 +178,7 @@ private boolean doInsert( final ResourceKey configuredResource, final Network network ) { - return PlatformApi.INSTANCE.getStorageMonitorInsertionStrategy().insert( + return RefinedStorageApi.INSTANCE.getStorageMonitorInsertionStrategy().insert( configuredResource, heldStack, new PlayerActor(player), @@ -197,7 +197,7 @@ private boolean doInsertAll(final Player player) { } private boolean doInsertAll(final Player player, final ItemResource lastInsertedItem) { - final Network network = mainNode.getNetwork(); + final Network network = mainNetworkNode.getNetwork(); if (network == null) { return false; } @@ -227,7 +227,7 @@ private boolean tryInsertSlot( if (!itemInSlot.equals(lastInsertedItem)) { return false; } - return PlatformApi.INSTANCE.getStorageMonitorInsertionStrategy().insert( + return RefinedStorageApi.INSTANCE.getStorageMonitorInsertionStrategy().insert( configuredResource, slot, new PlayerActor(player), @@ -320,7 +320,7 @@ private void sendDisplayUpdate() { if (level == null) { return; } - sendDisplayUpdate(level, getAmount(), mainNode.isActive()); + sendDisplayUpdate(level, getAmount(), mainNetworkNode.isActive()); } private void sendDisplayUpdate(final Level level, final long amount, final boolean active) { diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlockEntityRenderer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlockEntityRenderer.java index 5489bcff1..519001ddf 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlockEntityRenderer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storagemonitor/StorageMonitorBlockEntityRenderer.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.common.storagemonitor; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceRendering; import com.refinedmods.refinedstorage.common.support.direction.BiDirection; import com.refinedmods.refinedstorage.common.support.direction.BiDirectionType; @@ -61,7 +61,7 @@ private void doRender(final Level level, final BiDirection direction, final ResourceKey resource, final long amount) { - final ResourceRendering resourceRendering = PlatformApi.INSTANCE.getResourceRendering(resource); + final ResourceRendering resourceRendering = RefinedStorageApi.INSTANCE.getResourceRendering(resource); doRender( poseStack, vertexConsumers, diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseBlock.java index 37ccef995..25b42d47f 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseBlock.java @@ -1,8 +1,8 @@ package com.refinedmods.refinedstorage.common.support; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; -import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; import com.refinedmods.refinedstorage.common.content.BlockColorMap; import com.refinedmods.refinedstorage.common.content.Sounds; import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeMenuProvider; @@ -11,6 +11,7 @@ import javax.annotation.Nullable; import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; @@ -97,7 +98,7 @@ private Optional tryOpenScreen(final BlockState state, private void tryOpenScreen(final ServerPlayer player, final MenuProvider menuProvider) { if (menuProvider instanceof NetworkNodeMenuProvider networkNodeMenuProvider && !networkNodeMenuProvider.canOpen(player)) { - PlatformApi.INSTANCE.sendNoPermissionToOpenMessage(player, getName()); + RefinedStorageApi.INSTANCE.sendNoPermissionToOpenMessage(player, getName()); return; } Platform.INSTANCE.getMenuOpener().openMenu(player, menuProvider); @@ -179,18 +180,19 @@ private boolean dismantleOrRotate(final BlockState state, if (player.isCrouching()) { return dismantle(state, level, hitResult, player); } else { - return rotate(state, level, hitResult.getBlockPos(), player); + // TODO: validate dir. + return rotate(state, level, hitResult.getBlockPos(), hitResult.getDirection(), player); } } private boolean rotate(final BlockState state, final Level level, final BlockPos pos, + final Direction direction, final ServerPlayer player) { - final BlockEntity blockEntity = level.getBlockEntity(pos); - if (blockEntity instanceof NetworkNodeContainerBlockEntity networkNodeContainerBlockEntity - && !networkNodeContainerBlockEntity.canBuild(player)) { - PlatformApi.INSTANCE.sendNoPermissionMessage( + final NetworkNodeContainerProvider provider = Platform.INSTANCE.getContainerProvider(level, pos, direction); + if (provider != null && !provider.canBuild(player)) { + RefinedStorageApi.INSTANCE.sendNoPermissionMessage( player, createTranslation("misc", "no_permission.build.rotate", getName()) ); @@ -213,15 +215,19 @@ private boolean dismantle(final BlockState state, final Level level, final BlockHitResult hitResult, final ServerPlayer player) { - final BlockEntity blockEntity = level.getBlockEntity(hitResult.getBlockPos()); - if (blockEntity instanceof NetworkNodeContainerBlockEntity networkNodeContainerBlockEntity - && !networkNodeContainerBlockEntity.canBuild(player)) { - PlatformApi.INSTANCE.sendNoPermissionMessage( + final NetworkNodeContainerProvider provider = Platform.INSTANCE.getContainerProvider( + level, + hitResult.getBlockPos(), + hitResult.getDirection().getOpposite() // todo verify + ); + if (provider != null && !provider.canBuild(player)) { + RefinedStorageApi.INSTANCE.sendNoPermissionMessage( player, createTranslation("misc", "no_permission.build.dismantle", getName()) ); return false; } + final BlockEntity blockEntity = level.getBlockEntity(hitResult.getBlockPos()); final ItemStack stack = Platform.INSTANCE.getCloneItemStack(state, level, hitResult, player); if (blockEntity != null) { blockEntity.saveToItem(stack, level.registryAccess()); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseScreen.java index a06641b5e..6c642ed05 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseScreen.java @@ -2,7 +2,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceFactory; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceRendering; @@ -125,7 +125,7 @@ private void renderResourceSlot(final GuiGraphics graphics, final ResourceKey resource, final long amount, final boolean renderAmount) { - final ResourceRendering rendering = PlatformApi.INSTANCE.getResourceRendering(resource); + final ResourceRendering rendering = RefinedStorageApi.INSTANCE.getResourceRendering(resource); rendering.render(resource, graphics, x, y); if (renderAmount) { renderResourceSlotAmount(graphics, x, y, amount, rendering); @@ -264,7 +264,7 @@ private List getResourceSlotHelpTooltip(final ItemStack private List getTooltipForResource(final ResourceKey resource, final ResourceSlot resourceSlot) { - final List tooltip = PlatformApi.INSTANCE + final List tooltip = RefinedStorageApi.INSTANCE .getResourceRendering(resource) .getTooltip(resource) .stream() @@ -275,7 +275,7 @@ private List getTooltipForResource(final ResourceKey res tooltip.add(CLICK_TO_CLEAR); } if (resourceSlot.supportsItemSlotInteractions()) { - PlatformApi.INSTANCE.getResourceContainerInsertStrategies() + RefinedStorageApi.INSTANCE.getResourceContainerInsertStrategies() .stream() .flatMap(strategy -> strategy.getConversionInfo(resource).stream()) .map(conversionInfo -> MouseClientTooltipComponent.itemConversion( diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractDirectionalBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractDirectionalBlock.java index fdd2d1f28..c1128fd88 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractDirectionalBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractDirectionalBlock.java @@ -87,4 +87,12 @@ public static boolean doesBlockStateChangeWarrantNetworkNodeUpdate(final BlockSt newDirectionalBlock.getDirection(newBlockState) ); } + + @Nullable + public static Direction tryExtractDirection(final BlockState blockState) { + if (!(blockState.getBlock() instanceof AbstractDirectionalBlock directionalBlock)) { + return null; + } + return directionalBlock.extractDirection(blockState); + } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/CableBlockSupport.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/CableBlockSupport.java index 213f87f89..cdf0efc1d 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/CableBlockSupport.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/CableBlockSupport.java @@ -1,6 +1,7 @@ package com.refinedmods.refinedstorage.common.support; -import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; import java.util.HashMap; import java.util.Map; @@ -8,6 +9,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; @@ -87,12 +89,14 @@ public static BlockState getState( final BlockPos pos, @Nullable final Direction blacklistedDirection ) { - final boolean north = hasVisualConnection(currentState, level, pos, Direction.NORTH, blacklistedDirection); - final boolean east = hasVisualConnection(currentState, level, pos, Direction.EAST, blacklistedDirection); - final boolean south = hasVisualConnection(currentState, level, pos, Direction.SOUTH, blacklistedDirection); - final boolean west = hasVisualConnection(currentState, level, pos, Direction.WEST, blacklistedDirection); - final boolean up = hasVisualConnection(currentState, level, pos, Direction.UP, blacklistedDirection); - final boolean down = hasVisualConnection(currentState, level, pos, Direction.DOWN, blacklistedDirection); + // TODO: change. + final Level level1 = (Level) level; + final boolean north = hasVisualConnection(currentState, level1, pos, Direction.NORTH, blacklistedDirection); + final boolean east = hasVisualConnection(currentState, level1, pos, Direction.EAST, blacklistedDirection); + final boolean south = hasVisualConnection(currentState, level1, pos, Direction.SOUTH, blacklistedDirection); + final boolean west = hasVisualConnection(currentState, level1, pos, Direction.WEST, blacklistedDirection); + final boolean up = hasVisualConnection(currentState, level1, pos, Direction.UP, blacklistedDirection); + final boolean down = hasVisualConnection(currentState, level1, pos, Direction.DOWN, blacklistedDirection); return currentState .setValue(NORTH, north) @@ -105,7 +109,7 @@ public static BlockState getState( private static boolean hasVisualConnection( final BlockState blockState, - final LevelAccessor level, + final Level level, final BlockPos pos, final Direction direction, @Nullable final Direction blacklistedDirection @@ -114,7 +118,12 @@ private static boolean hasVisualConnection( return false; } final BlockPos offsetPos = pos.relative(direction); - if (!(level.getBlockEntity(offsetPos) instanceof NetworkNodeContainerBlockEntity neighbor)) { + final NetworkNodeContainerProvider neighbor = Platform.INSTANCE.getContainerProvider( + level, + offsetPos, + direction.getOpposite() + ); + if (neighbor == null) { return false; } return neighbor.getContainers() diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/NetworkNodeBlockItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/NetworkNodeBlockItem.java index 3baf8a5f8..42f3575b4 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/NetworkNodeBlockItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/NetworkNodeBlockItem.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.support; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import javax.annotation.Nullable; @@ -21,8 +21,12 @@ public NetworkNodeBlockItem(final Block block, final Properties properties, @Nul @Override protected boolean placeBlock(final BlockPlaceContext ctx, final BlockState state) { - if (ctx.getPlayer() instanceof ServerPlayer serverPlayer - && !(PlatformApi.INSTANCE.canPlaceNetworkNode(serverPlayer, ctx.getLevel(), ctx.getClickedPos(), state))) { + if (ctx.getPlayer() instanceof ServerPlayer serverPlayer && !(RefinedStorageApi.INSTANCE.canPlaceNetworkNode( + serverPlayer, + ctx.getLevel(), + ctx.getClickedPos(), + state + ))) { return false; } return super.placeBlock(ctx, state); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/AbstractSimpleFilterContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/AbstractSimpleFilterContainerMenu.java index 0ac713831..19c5ecac6 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/AbstractSimpleFilterContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/AbstractSimpleFilterContainerMenu.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.support.containermenu; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl; @@ -50,7 +50,7 @@ protected AbstractSimpleFilterContainerMenu(final MenuType type, ResourceContainerImpl.createForFilter(resourceContainerData), upgradeDestination == null ? null - : new UpgradeContainer(upgradeDestination, PlatformApi.INSTANCE.getUpgradeRegistry()) + : new UpgradeContainer(upgradeDestination, RefinedStorageApi.INSTANCE.getUpgradeRegistry()) ); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/NetworkNodeMenuProvider.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/NetworkNodeMenuProvider.java index 36f97d08b..2a262a5ef 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/NetworkNodeMenuProvider.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/NetworkNodeMenuProvider.java @@ -1,18 +1,20 @@ package com.refinedmods.refinedstorage.common.support.containermenu; import com.refinedmods.refinedstorage.common.api.security.SecurityHelper; -import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; import com.refinedmods.refinedstorage.common.security.BuiltinPermission; -import java.util.Set; - import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.MenuProvider; public interface NetworkNodeMenuProvider extends MenuProvider { - Set getContainers(); + NetworkNodeContainerProvider getContainerProvider(); default boolean canOpen(final ServerPlayer player) { - return SecurityHelper.isAllowed(player, BuiltinPermission.OPEN, getContainers()); + return SecurityHelper.isAllowed( + player, + BuiltinPermission.OPEN, + getContainerProvider().getContainers() + ); } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ResourceSlot.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ResourceSlot.java index 258144c56..41ca7769d 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ResourceSlot.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/containermenu/ResourceSlot.java @@ -2,7 +2,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceFactory; @@ -224,7 +224,7 @@ public ItemStack insertInto(final ItemStack carried) { if (currentResourceAmount == null) { return null; } - return PlatformApi.INSTANCE.getResourceContainerInsertStrategies().stream() + return RefinedStorageApi.INSTANCE.getResourceContainerInsertStrategies().stream() .flatMap(strategy -> strategy.insert(carried, currentResourceAmount).stream()) .findFirst() .map(result -> { diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/EnergyItemHelperImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/EnergyItemHelperImpl.java index d816bc0bb..86b6942d2 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/EnergyItemHelperImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/EnergyItemHelperImpl.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.common.support.energy; import com.refinedmods.refinedstorage.api.core.Action; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.energy.EnergyItemHelper; import com.refinedmods.refinedstorage.common.api.support.energy.TransferableBlockEntityEnergy; @@ -20,7 +20,7 @@ public class EnergyItemHelperImpl implements EnergyItemHelper { @Override public void addTooltip(final ItemStack stack, final List lines) { - PlatformApi.INSTANCE.getEnergyStorage(stack).ifPresent(energyStorage -> { + RefinedStorageApi.INSTANCE.getEnergyStorage(stack).ifPresent(energyStorage -> { final long stored = energyStorage.getStored(); final long capacity = energyStorage.getCapacity(); final double pct = stored / (double) capacity; @@ -30,19 +30,19 @@ public void addTooltip(final ItemStack stack, final List lines) { @Override public boolean isBarVisible(final ItemStack stack) { - return PlatformApi.INSTANCE.getEnergyStorage(stack).isPresent(); + return RefinedStorageApi.INSTANCE.getEnergyStorage(stack).isPresent(); } @Override public int getBarWidth(final ItemStack stack) { - return PlatformApi.INSTANCE.getEnergyStorage(stack).map(energyStorage -> (int) Math.round( + return RefinedStorageApi.INSTANCE.getEnergyStorage(stack).map(energyStorage -> (int) Math.round( (energyStorage.getStored() / (double) energyStorage.getCapacity()) * 13D )).orElse(0); } @Override public int getBarColor(final ItemStack stack) { - return PlatformApi.INSTANCE.getEnergyStorage(stack).map(energyStorage -> Mth.hsvToRgb( + return RefinedStorageApi.INSTANCE.getEnergyStorage(stack).map(energyStorage -> Mth.hsvToRgb( Math.max(0.0F, (float) energyStorage.getStored() / (float) energyStorage.getCapacity()) / 3.0F, 1.0F, 1.0F @@ -52,7 +52,7 @@ public int getBarColor(final ItemStack stack) { @Override public ItemStack createAtEnergyCapacity(final Item item) { final ItemStack stack = item.getDefaultInstance(); - PlatformApi.INSTANCE.getEnergyStorage(stack).ifPresent(energyStorage -> energyStorage.receive( + RefinedStorageApi.INSTANCE.getEnergyStorage(stack).ifPresent(energyStorage -> energyStorage.receive( energyStorage.getCapacity(), Action.EXECUTE )); @@ -65,7 +65,7 @@ public void passEnergyToBlockEntity(final BlockPos pos, final Level level, final || !(level.getBlockEntity(pos) instanceof TransferableBlockEntityEnergy transferableBlockEntityEnergy)) { return; } - PlatformApi.INSTANCE.getEnergyStorage(stack).ifPresent( + RefinedStorageApi.INSTANCE.getEnergyStorage(stack).ifPresent( energyStorage -> transferableBlockEntityEnergy.getEnergyStorage() .receive(energyStorage.getStored(), Action.EXECUTE) ); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/EnergyLootItemFunction.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/EnergyLootItemFunction.java index 5238f6f63..e31c23be5 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/EnergyLootItemFunction.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/energy/EnergyLootItemFunction.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.common.support.energy; import com.refinedmods.refinedstorage.api.core.Action; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.energy.TransferableBlockEntityEnergy; import com.refinedmods.refinedstorage.common.content.LootFunctions; @@ -23,7 +23,7 @@ public ItemStack apply(final ItemStack stack, final LootContext lootContext) { final BlockEntity blockEntity = lootContext.getParam(LootContextParams.BLOCK_ENTITY); if (blockEntity instanceof TransferableBlockEntityEnergy transferableBlockEntityEnergy) { final long stored = transferableBlockEntityEnergy.getEnergyStorage().getStored(); - PlatformApi.INSTANCE.getEnergyStorage(stack).ifPresent( + RefinedStorageApi.INSTANCE.getEnergyStorage(stack).ifPresent( energyStorage -> energyStorage.receive(stored, Action.EXECUTE) ); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java index 31a281524..caa4b58f4 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java @@ -11,6 +11,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock.tryExtractDirection; + public abstract class AbstractLevelInteractingNetworkNodeContainerBlockEntity extends AbstractRedstoneModeNetworkNodeContainerBlockEntity { private static final Logger LOGGER = LoggerFactory.getLogger( @@ -46,7 +48,7 @@ public void setLevel(final Level level) { } protected final void initialize(final ServerLevel level) { - final Direction direction = getDirection(); + final Direction direction = tryExtractDirection(getBlockState()); if (direction == null) { LOGGER.warn( "Failed to initialize: could not extract direction from block at {}, state is {}", diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java index 46561ab08..6645b061a 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.common.support.network; import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.content.Items; import com.refinedmods.refinedstorage.common.support.BlockEntityWithDrops; import com.refinedmods.refinedstorage.common.upgrade.UpgradeContainer; @@ -45,7 +45,7 @@ protected AbstractUpgradeableNetworkNodeContainerBlockEntity( super(type, pos, state, node); this.upgradeContainer = new UpgradeContainer( destination, - PlatformApi.INSTANCE.getUpgradeRegistry(), + RefinedStorageApi.INSTANCE.getUpgradeRegistry(), this::upgradeContainerChanged ); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/BaseNetworkNodeContainerBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/BaseNetworkNodeContainerBlockEntity.java index 84ad12112..85055e53a 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/BaseNetworkNodeContainerBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/BaseNetworkNodeContainerBlockEntity.java @@ -3,18 +3,15 @@ import com.refinedmods.refinedstorage.api.network.Network; import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.network.AbstractNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage.common.api.support.network.ConnectionLogic; -import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemTargetBlockEntity; -import com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage.common.support.ColorableBlock; import javax.annotation.Nullable; import com.google.common.util.concurrent.RateLimiter; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BooleanProperty; @@ -22,8 +19,7 @@ import org.slf4j.LoggerFactory; public class BaseNetworkNodeContainerBlockEntity - extends AbstractNetworkNodeContainerBlockEntity - implements ConnectionLogic, NetworkItemTargetBlockEntity { + extends AbstractNetworkNodeContainerBlockEntity implements NetworkItemTargetBlockEntity { private static final Logger LOGGER = LoggerFactory.getLogger(BaseNetworkNodeContainerBlockEntity.class); private final RateLimiter activenessChangeRateLimiter = RateLimiter.create(1); @@ -35,17 +31,24 @@ public BaseNetworkNodeContainerBlockEntity(final BlockEntityType type, super(type, pos, state, networkNode); } + @Override + protected InWorldNetworkNodeContainer createMainContainer(final T networkNode) { + return RefinedStorageApi.INSTANCE.createNetworkNodeContainer(this, networkNode) + .connectionStrategy(new ColoredConnectionStrategy(this::getBlockState, getBlockPos())) + .build(); + } + protected boolean calculateActive() { - final long energyUsage = mainNode.getEnergyUsage(); + final long energyUsage = mainNetworkNode.getEnergyUsage(); final boolean hasLevel = level != null && level.isLoaded(worldPosition); return hasLevel - && mainNode.getNetwork() != null - && mainNode.getNetwork().getComponent(EnergyNetworkComponent.class).getStored() >= energyUsage; + && mainNetworkNode.getNetwork() != null + && mainNetworkNode.getNetwork().getComponent(EnergyNetworkComponent.class).getStored() >= energyUsage; } public void updateActiveness(final BlockState state, @Nullable final BooleanProperty activenessProperty) { final boolean newActive = calculateActive(); - final boolean nodeActivenessNeedsUpdate = newActive != mainNode.isActive(); + final boolean nodeActivenessNeedsUpdate = newActive != mainNetworkNode.isActive(); final boolean blockStateActivenessNeedsUpdate = activenessProperty != null && state.getValue(activenessProperty) != newActive; final boolean activenessNeedsUpdate = nodeActivenessNeedsUpdate || blockStateActivenessNeedsUpdate; @@ -60,8 +63,8 @@ public void updateActiveness(final BlockState state, @Nullable final BooleanProp } protected void activenessChanged(final boolean newActive) { - LOGGER.debug("Activeness change for node at {}: {} -> {}", getBlockPos(), mainNode.isActive(), newActive); - mainNode.setActive(newActive); + LOGGER.debug("Activeness change for node at {}: {} -> {}", getBlockPos(), mainNetworkNode.isActive(), newActive); + mainNetworkNode.setActive(newActive); } private void updateActivenessBlockState(final BlockState state, @@ -79,64 +82,7 @@ private void updateActivenessBlockState(final BlockState state, } public void doWork() { - mainNode.doWork(); - } - - @Override - public void addOutgoingConnections(final ConnectionSink sink) { - final Direction myDirection = getDirection(); - if (myDirection == null) { - super.addOutgoingConnections(sink); - return; - } - for (final Direction direction : Direction.values()) { - if (direction == myDirection) { - continue; - } - sink.tryConnectInSameDimension(worldPosition.relative(direction), direction.getOpposite()); - } - } - - @Override - public boolean canAcceptIncomingConnection(final Direction incomingDirection, final BlockState connectingState) { - if (!colorsAllowConnecting(connectingState)) { - return false; - } - final Direction myDirection = getDirection(); - if (myDirection != null) { - return myDirection != incomingDirection; - } - return true; - } - - protected final boolean colorsAllowConnecting(final BlockState connectingState) { - if (!(connectingState.getBlock() instanceof ColorableBlock otherColorableBlock)) { - return true; - } - final ColorableBlock colorableBlock = getColor(); - if (colorableBlock == null) { - return true; - } - return otherColorableBlock.getColor() == colorableBlock.getColor() - || colorableBlock.canAlwaysConnect() - || otherColorableBlock.canAlwaysConnect(); - } - - @Nullable - private ColorableBlock getColor() { - if (!(getBlockState().getBlock() instanceof ColorableBlock colorableBlock)) { - return null; - } - return colorableBlock; - } - - @Nullable - protected final Direction getDirection() { - final BlockState blockState = getBlockState(); - if (!(blockState.getBlock() instanceof AbstractDirectionalBlock directionalBlock)) { - return null; - } - return directionalBlock.extractDirection(blockState); + mainNetworkNode.doWork(); } protected boolean doesBlockStateChangeWarrantNetworkNodeUpdate( @@ -154,12 +100,12 @@ public void setBlockState(final BlockState newBlockState) { if (!doesBlockStateChangeWarrantNetworkNodeUpdate(oldBlockState, newBlockState)) { return; } - updateContainers(); + containers.update(level); } @Nullable @Override public Network getNetworkForItem() { - return mainNode.getNetwork(); + return mainNetworkNode.getNetwork(); } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/ColoredConnectionStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/ColoredConnectionStrategy.java new file mode 100644 index 000000000..9e0a32bb9 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/ColoredConnectionStrategy.java @@ -0,0 +1,70 @@ +package com.refinedmods.refinedstorage.common.support.network; + +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.common.support.ColorableBlock; + +import java.util.function.Supplier; +import javax.annotation.Nullable; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.level.block.state.BlockState; + +import static com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock.tryExtractDirection; + +public class ColoredConnectionStrategy extends SimpleConnectionStrategy { + protected final Supplier blockStateProvider; + + public ColoredConnectionStrategy(final Supplier blockStateProvider, final BlockPos origin) { + super(origin); + this.blockStateProvider = blockStateProvider; + } + + @Override + public void addOutgoingConnections(final ConnectionSink sink) { + final Direction myDirection = tryExtractDirection(blockStateProvider.get()); + if (myDirection == null) { + super.addOutgoingConnections(sink); + return; + } + for (final Direction direction : Direction.values()) { + if (direction == myDirection) { + continue; + } + sink.tryConnectInSameDimension(origin.relative(direction), direction.getOpposite()); + } + } + + @Override + public boolean canAcceptIncomingConnection(final Direction incomingDirection, final BlockState connectingState) { + if (!colorsAllowConnecting(connectingState)) { + return false; + } + final Direction myDirection = tryExtractDirection(blockStateProvider.get()); + if (myDirection != null) { + return myDirection != incomingDirection; + } + return true; + } + + protected final boolean colorsAllowConnecting(final BlockState connectingState) { + if (!(connectingState.getBlock() instanceof ColorableBlock otherColorableBlock)) { + return true; + } + final ColorableBlock colorableBlock = getColor(); + if (colorableBlock == null) { + return true; + } + return otherColorableBlock.getColor() == colorableBlock.getColor() + || colorableBlock.canAlwaysConnect() + || otherColorableBlock.canAlwaysConnect(); + } + + @Nullable + private ColorableBlock getColor() { + if (!(blockStateProvider.get().getBlock() instanceof ColorableBlock colorableBlock)) { + return null; + } + return colorableBlock; + } +} diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/ConnectionProviderImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/ConnectionProviderImpl.java index 6df94dde1..2ea7fd159 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/ConnectionProviderImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/ConnectionProviderImpl.java @@ -3,8 +3,9 @@ import com.refinedmods.refinedstorage.api.network.ConnectionProvider; import com.refinedmods.refinedstorage.api.network.Connections; import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; +import com.refinedmods.refinedstorage.common.Platform; import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; import java.util.ArrayDeque; import java.util.ArrayList; @@ -18,12 +19,10 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; -import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; import net.minecraft.core.GlobalPos; import net.minecraft.server.MinecraftServer; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.chunk.LevelChunk; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -100,14 +99,17 @@ private List findConnectionsAt(final InWorldNetwork private Set getConnections(final InWorldNetworkNodeContainer from, final ConnectionSinkImpl.Connection connection) { - final BlockEntity connectionBlockEntity = getBlockEntitySafely(connection.pos()); - if (!(connectionBlockEntity instanceof NetworkNodeContainerBlockEntity networkNodeContainerBlockEntity)) { + final NetworkNodeContainerProvider provider = getContainerProviderSafely( + connection.pos(), + connection.incomingDirection() + ); + if (provider == null) { return Collections.emptySet(); } if (connection.incomingDirection() == null) { - return networkNodeContainerBlockEntity.getContainers(); + return provider.getContainers(); } - return networkNodeContainerBlockEntity.getContainers() + return provider.getContainers() .stream() .filter(container -> container.canAcceptIncomingConnection( connection.incomingDirection(), @@ -125,7 +127,8 @@ public List sortDeterministically(final Set keyProvider; + + public InWorldNetworkNodeContainerBuilder(final BlockEntity blockEntity, final NetworkNode networkNode) { + this.blockEntity = blockEntity; + this.networkNode = networkNode; + this.connectionStrategy = new SimpleConnectionStrategy(blockEntity.getBlockPos()); + } + + @Override + public InWorldNetworkNodeContainer.Builder name(final String builderName) { + this.name = builderName; + return this; + } + + @Override + public InWorldNetworkNodeContainer.Builder priority(final int builderPriority) { + this.priority = builderPriority; + return this; + } + + @Override + public InWorldNetworkNodeContainer.Builder connectionStrategy(final ConnectionStrategy builderConnectionStrategy) { + this.connectionStrategy = builderConnectionStrategy; + return this; + } + + @Override + public InWorldNetworkNodeContainer.Builder keyProvider(final Supplier builderKeyProvider) { + this.keyProvider = builderKeyProvider; + return this; + } + + @Override + public InWorldNetworkNodeContainer build() { + return new InWorldNetworkNodeContainerImpl( + blockEntity, + networkNode, + name, + priority, + connectionStrategy, + keyProvider + ); + } +} diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/InWorldNetworkNodeContainerImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/InWorldNetworkNodeContainerImpl.java index 16d31d47b..4d481d3a8 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/InWorldNetworkNodeContainerImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/InWorldNetworkNodeContainerImpl.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.common.support.network; import com.refinedmods.refinedstorage.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage.common.api.support.network.ConnectionLogic; +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionStrategy; import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; @@ -21,7 +21,7 @@ public class InWorldNetworkNodeContainerImpl implements InWorldNetworkNodeContai private final NetworkNode node; private final String name; private final int priority; - private final ConnectionLogic connectionLogic; + private final ConnectionStrategy connectionStrategy; @Nullable private final Supplier keyProvider; @@ -29,13 +29,13 @@ public InWorldNetworkNodeContainerImpl(final BlockEntity blockEntity, final NetworkNode node, final String name, final int priority, - final ConnectionLogic connectionLogic, + final ConnectionStrategy connectionStrategy, @Nullable final Supplier keyProvider) { this.blockEntity = blockEntity; this.node = node; this.name = name; this.priority = priority; - this.connectionLogic = connectionLogic; + this.connectionStrategy = connectionStrategy; this.keyProvider = keyProvider; } @@ -46,12 +46,12 @@ public NetworkNode getNode() { @Override public void addOutgoingConnections(final ConnectionSink sink) { - connectionLogic.addOutgoingConnections(sink); + connectionStrategy.addOutgoingConnections(sink); } @Override public boolean canAcceptIncomingConnection(final Direction incomingDirection, final BlockState connectingState) { - return connectionLogic.canAcceptIncomingConnection(incomingDirection, connectingState); + return connectionStrategy.canAcceptIncomingConnection(incomingDirection, connectingState); } @Override diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/NetworkNodeContainerProviderImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/NetworkNodeContainerProviderImpl.java new file mode 100644 index 000000000..04a1901c8 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/NetworkNodeContainerProviderImpl.java @@ -0,0 +1,32 @@ +package com.refinedmods.refinedstorage.common.support.network; + +import com.refinedmods.refinedstorage.common.api.security.SecurityHelper; +import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; +import com.refinedmods.refinedstorage.common.security.BuiltinPermission; + +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +import net.minecraft.server.level.ServerPlayer; + +public class NetworkNodeContainerProviderImpl implements NetworkNodeContainerProvider { + private final Set containers = new HashSet<>(1); + private final Set containersView = Collections.unmodifiableSet(containers); + + @Override + public Set getContainers() { + return containersView; + } + + @Override + public void addContainer(final InWorldNetworkNodeContainer container) { + containers.add(container); + } + + @Override + public boolean canBuild(final ServerPlayer player) { + return SecurityHelper.isAllowed(player, BuiltinPermission.BUILD, getContainers()); + } +} diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/SimpleConnectionStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/SimpleConnectionStrategy.java new file mode 100644 index 000000000..9eccd000e --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/SimpleConnectionStrategy.java @@ -0,0 +1,28 @@ +package com.refinedmods.refinedstorage.common.support.network; + +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionStrategy; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.level.block.state.BlockState; + +public class SimpleConnectionStrategy implements ConnectionStrategy { + protected final BlockPos origin; + + public SimpleConnectionStrategy(final BlockPos origin) { + this.origin = origin; + } + + @Override + public void addOutgoingConnections(final ConnectionSink sink) { + for (final Direction direction : Direction.values()) { + sink.tryConnectInSameDimension(origin.relative(direction), direction.getOpposite()); + } + } + + @Override + public boolean canAcceptIncomingConnection(final Direction incomingDirection, final BlockState connectingState) { + return true; + } +} diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/SecurityCardPermissionPacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/SecurityCardPermissionPacket.java index b18761c15..90d4d4a12 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/SecurityCardPermissionPacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/SecurityCardPermissionPacket.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.support.packet.c2s; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; import com.refinedmods.refinedstorage.common.security.AbstractSecurityCardContainerMenu; import com.refinedmods.refinedstorage.common.support.packet.PacketContext; @@ -19,7 +19,7 @@ public record SecurityCardPermissionPacket(PlatformPermission permission, boolea ); public static final StreamCodec STREAM_CODEC = StreamCodec .composite( - PlatformApi.INSTANCE.getPermissionRegistry().streamCodec(), SecurityCardPermissionPacket::permission, + RefinedStorageApi.INSTANCE.getPermissionRegistry().streamCodec(), SecurityCardPermissionPacket::permission, ByteBufCodecs.BOOL, SecurityCardPermissionPacket::allowed, SecurityCardPermissionPacket::new ); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/SecurityCardResetPermissionPacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/SecurityCardResetPermissionPacket.java index f82d79f2a..76b4c7fe3 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/SecurityCardResetPermissionPacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/SecurityCardResetPermissionPacket.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.support.packet.c2s; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.security.PlatformPermission; import com.refinedmods.refinedstorage.common.security.AbstractSecurityCardContainerMenu; import com.refinedmods.refinedstorage.common.support.packet.PacketContext; @@ -17,7 +17,8 @@ public record SecurityCardResetPermissionPacket(PlatformPermission permission) i ); public static final StreamCodec STREAM_CODEC = StreamCodec.composite( - PlatformApi.INSTANCE.getPermissionRegistry().streamCodec(), SecurityCardResetPermissionPacket::permission, + RefinedStorageApi.INSTANCE.getPermissionRegistry().streamCodec(), + SecurityCardResetPermissionPacket::permission, SecurityCardResetPermissionPacket::new ); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/StorageInfoRequestPacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/StorageInfoRequestPacket.java index 220da695b..c887b7338 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/StorageInfoRequestPacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/StorageInfoRequestPacket.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.support.packet.c2s; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.storage.StorageInfo; import com.refinedmods.refinedstorage.common.support.packet.PacketContext; import com.refinedmods.refinedstorage.common.support.packet.s2c.S2CPackets; @@ -28,7 +28,7 @@ public record StorageInfoRequestPacket(UUID storageId) implements CustomPacketPa public static void handle(final StorageInfoRequestPacket packet, final PacketContext ctx) { final Player player = ctx.getPlayer(); - final StorageInfo info = PlatformApi.INSTANCE + final StorageInfo info = RefinedStorageApi.INSTANCE .getStorageRepository(player.getCommandSenderWorld()) .getInfo(packet.storageId()); S2CPackets.sendStorageInfoResponse((ServerPlayer) player, packet.storageId, info); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/StorageInfoResponsePacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/StorageInfoResponsePacket.java index b03e65b61..7f04650db 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/StorageInfoResponsePacket.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/StorageInfoResponsePacket.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.support.packet.s2c; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.storage.ClientStorageRepository; import java.util.UUID; @@ -27,7 +27,7 @@ public record StorageInfoResponsePacket(UUID storageId, long stored, long capaci public static void handle(final StorageInfoResponsePacket packet) { final ClientStorageRepository storageRepository = - (ClientStorageRepository) PlatformApi.INSTANCE.getClientStorageRepository(); + (ClientStorageRepository) RefinedStorageApi.INSTANCE.getClientStorageRepository(); storageRepository.setInfo(packet.storageId, packet.stored, packet.capacity); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceCodecs.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceCodecs.java index caf3ba22a..9f44cb67b 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceCodecs.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceCodecs.java @@ -2,7 +2,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceType; @@ -33,7 +33,7 @@ public final class ResourceCodecs { ).apply(ins, FluidResource::new)); public static final Codec FLUID_CODEC = FLUID_MAP_CODEC.codec(); - public static final Codec CODEC = PlatformApi.INSTANCE.getResourceTypeRegistry() + public static final Codec CODEC = RefinedStorageApi.INSTANCE.getResourceTypeRegistry() .codec() .dispatch(PlatformResourceKey::getResourceType, ResourceType::getMapCodec); public static final Codec AMOUNT_CODEC = RecordCodecBuilder.create(instance -> instance.group( @@ -45,14 +45,16 @@ public final class ResourceCodecs { @Override public PlatformResourceKey decode(final RegistryFriendlyByteBuf buf) { final ResourceLocation id = buf.readResourceLocation(); - final ResourceType resourceType = PlatformApi.INSTANCE.getResourceTypeRegistry().get(id).orElseThrow(); + final ResourceType resourceType = RefinedStorageApi.INSTANCE.getResourceTypeRegistry() + .get(id) + .orElseThrow(); return resourceType.getStreamCodec().decode(buf); } @Override public void encode(final RegistryFriendlyByteBuf buf, final PlatformResourceKey resourceKey) { final ResourceType resourceType = resourceKey.getResourceType(); - final ResourceLocation id = PlatformApi.INSTANCE.getResourceTypeRegistry().getId(resourceType) + final ResourceLocation id = RefinedStorageApi.INSTANCE.getResourceTypeRegistry().getId(resourceType) .orElseThrow(); buf.writeResourceLocation(id); resourceType.getStreamCodec().encode(buf, resourceKey); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceContainerImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceContainerImpl.java index d860fcc0f..f41dcc314 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceContainerImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ResourceContainerImpl.java @@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.api.core.CoreValidations; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceFactory; @@ -374,8 +374,8 @@ public static ResourceContainer createForFilter(final int size) { return new ResourceContainerImpl( size, resource -> Long.MAX_VALUE, - PlatformApi.INSTANCE.getItemResourceFactory(), - PlatformApi.INSTANCE.getAlternativeResourceFactories() + RefinedStorageApi.INSTANCE.getItemResourceFactory(), + RefinedStorageApi.INSTANCE.getAlternativeResourceFactories() ); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/MouseClientTooltipComponent.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/MouseClientTooltipComponent.java index e22efeacd..2af039f4f 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/MouseClientTooltipComponent.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/MouseClientTooltipComponent.java @@ -2,7 +2,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.support.TextureIds; import com.refinedmods.refinedstorage.common.support.resource.FluidResource; @@ -97,7 +97,8 @@ public static ClientTooltipComponent resource(final Type type, @Nullable final String amount) { return new MouseClientTooltipComponent( type, - (graphics, x, y) -> PlatformApi.INSTANCE.getResourceRendering(resource).render(resource, graphics, x, y), + (graphics, x, y) -> RefinedStorageApi.INSTANCE.getResourceRendering(resource) + .render(resource, graphics, x, y), amount ); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/ResourceClientTooltipComponent.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/ResourceClientTooltipComponent.java index 080868573..c5bb0b3a4 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/ResourceClientTooltipComponent.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/tooltip/ResourceClientTooltipComponent.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.common.support.tooltip; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceRendering; import java.util.Objects; @@ -33,7 +33,7 @@ public int getWidth(final Font font) { @Override public void renderImage(final Font font, final int x, final int y, final GuiGraphics graphics) { - PlatformApi.INSTANCE.getResourceRendering(resourceAmount.getResource()).render( + RefinedStorageApi.INSTANCE.getResourceRendering(resourceAmount.getResource()).render( resourceAmount.getResource(), graphics, x, @@ -49,7 +49,7 @@ public void renderImage(final Font font, final int x, final int y, final GuiGrap } private static Component getNameWithAmount(final ResourceAmount resourceAmount) { - final ResourceRendering rendering = PlatformApi.INSTANCE.getResourceRendering( + final ResourceRendering rendering = RefinedStorageApi.INSTANCE.getResourceRendering( resourceAmount.getResource() ); final String amount = rendering.getDisplayedAmount(resourceAmount.getAmount(), true); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/RegulatorUpgradeItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/RegulatorUpgradeItem.java index 845b6ff2b..8f93f191f 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/RegulatorUpgradeItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/RegulatorUpgradeItem.java @@ -3,7 +3,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainer; import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; @@ -56,7 +56,7 @@ public InteractionResultHolder use(final Level level, final Player pl createResourceFilterContainer(stack, initialState), initialState.amount(), newAmount -> setAmount(stack, newAmount), - PlatformApi.INSTANCE.createInventorySlotReference(player, hand) + RefinedStorageApi.INSTANCE.createInventorySlotReference(player, hand) )); } return InteractionResultHolder.success(stack); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/SimpleUpgradeItem.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/SimpleUpgradeItem.java index cdf759fcd..69c47d873 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/SimpleUpgradeItem.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/SimpleUpgradeItem.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.common.upgrade; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.HelpTooltipComponent; import com.refinedmods.refinedstorage.common.api.upgrade.AbstractUpgradeItem; import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeRegistry; @@ -48,7 +48,7 @@ public Optional getTooltipImage(final ItemStack stack) { public static SimpleUpgradeItem speedUpgrade() { return new SimpleUpgradeItem( - PlatformApi.INSTANCE.getUpgradeRegistry(), + RefinedStorageApi.INSTANCE.getUpgradeRegistry(), Platform.INSTANCE.getConfig().getUpgrade()::getSpeedUpgradeEnergyUsage, false, createTranslation("item", "speed_upgrade.help") @@ -57,7 +57,7 @@ public static SimpleUpgradeItem speedUpgrade() { public static SimpleUpgradeItem stackUpgrade() { return new SimpleUpgradeItem( - PlatformApi.INSTANCE.getUpgradeRegistry(), + RefinedStorageApi.INSTANCE.getUpgradeRegistry(), Platform.INSTANCE.getConfig().getUpgrade()::getStackUpgradeEnergyUsage, false, createTranslation("item", "stack_upgrade.help") @@ -66,7 +66,7 @@ public static SimpleUpgradeItem stackUpgrade() { public static SimpleUpgradeItem silkTouchUpgrade() { return new SimpleUpgradeItem( - PlatformApi.INSTANCE.getUpgradeRegistry(), + RefinedStorageApi.INSTANCE.getUpgradeRegistry(), Platform.INSTANCE.getConfig().getUpgrade()::getSilkTouchUpgradeEnergyUsage, true, createTranslation("item", "silk_touch_upgrade.help") diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java index c33370440..bdd78012a 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java @@ -2,8 +2,7 @@ import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.PlatformApi; -import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; import com.refinedmods.refinedstorage.common.content.BlockEntities; import com.refinedmods.refinedstorage.common.content.ContentNames; @@ -19,7 +18,6 @@ import javax.annotation.Nullable; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; @@ -40,7 +38,7 @@ public class WirelessTransmitterBlockEntity private final UpgradeContainer upgradeContainer = new UpgradeContainer( UpgradeDestinations.WIRELESS_TRANSMITTER, - PlatformApi.INSTANCE.getUpgradeRegistry(), + RefinedStorageApi.INSTANCE.getUpgradeRegistry(), this::upgradeContainerChanged ); @@ -51,8 +49,13 @@ public WirelessTransmitterBlockEntity(final BlockPos pos, final BlockState state } @Override - protected InWorldNetworkNodeContainer createMainContainer(final SimpleNetworkNode node) { - return new WirelessTransmitterNetworkNodeContainer(this, node, MAIN_CONTAINER_NAME, this); + protected InWorldNetworkNodeContainer createMainContainer(final SimpleNetworkNode networkNode) { + return new WirelessTransmitterNetworkNodeContainer( + this, + networkNode, + "main", + new WirelessTransmitterConnectionStrategy(this::getBlockState, getBlockPos()) + ); } @Override @@ -79,24 +82,6 @@ public boolean addUpgradeItem(final Item upgradeItem) { return upgradeContainer.addUpgradeItem(upgradeItem); } - @Override - public void addOutgoingConnections(final ConnectionSink sink) { - final Direction myDirection = getDirection(); - if (myDirection == null) { - return; - } - sink.tryConnectInSameDimension(worldPosition.relative(myDirection), myDirection.getOpposite()); - } - - @Override - public boolean canAcceptIncomingConnection(final Direction incomingDirection, final BlockState connectingState) { - if (!colorsAllowConnecting(connectingState)) { - return false; - } - final Direction myDirection = getDirection(); - return incomingDirection == myDirection; - } - @Override public Component getDisplayName() { return ContentNames.WIRELESS_TRANSMITTER; @@ -119,12 +104,12 @@ public StreamEncoder getMenuCo } int getRange() { - return PlatformApi.INSTANCE.getWirelessTransmitterRangeModifier().modifyRange(upgradeContainer, 0); + return RefinedStorageApi.INSTANCE.getWirelessTransmitterRangeModifier().modifyRange(upgradeContainer, 0); } private void upgradeContainerChanged() { final long baseUsage = Platform.INSTANCE.getConfig().getWirelessTransmitter().getEnergyUsage(); - mainNode.setEnergyUsage(baseUsage + upgradeContainer.getEnergyUsage()); + mainNetworkNode.setEnergyUsage(baseUsage + upgradeContainer.getEnergyUsage()); setChanged(); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterConnectionStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterConnectionStrategy.java new file mode 100644 index 000000000..fbdc388d8 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterConnectionStrategy.java @@ -0,0 +1,36 @@ +package com.refinedmods.refinedstorage.common.wirelesstransmitter; + +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.common.support.network.ColoredConnectionStrategy; + +import java.util.function.Supplier; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.level.block.state.BlockState; + +import static com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock.tryExtractDirection; + +class WirelessTransmitterConnectionStrategy extends ColoredConnectionStrategy { + WirelessTransmitterConnectionStrategy(final Supplier blockStateProvider, final BlockPos origin) { + super(blockStateProvider, origin); + } + + @Override + public void addOutgoingConnections(final ConnectionSink sink) { + final Direction myDirection = tryExtractDirection(blockStateProvider.get()); + if (myDirection == null) { + return; + } + sink.tryConnectInSameDimension(origin.relative(myDirection), myDirection.getOpposite()); + } + + @Override + public boolean canAcceptIncomingConnection(final Direction incomingDirection, final BlockState connectingState) { + if (!colorsAllowConnecting(connectingState)) { + return false; + } + final Direction myDirection = tryExtractDirection(blockStateProvider.get()); + return incomingDirection == myDirection; + } +} diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java index 19a028469..5bf934a6f 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.wirelesstransmitter; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.content.Menus; import com.refinedmods.refinedstorage.common.support.AbstractBaseContainerMenu; import com.refinedmods.refinedstorage.common.support.RedstoneMode; @@ -33,7 +33,7 @@ public WirelessTransmitterContainerMenu(final int syncId, super(Menus.INSTANCE.getWirelessTransmitter(), syncId); addSlots(playerInventory, new UpgradeContainer( UpgradeDestinations.WIRELESS_TRANSMITTER, - PlatformApi.INSTANCE.getUpgradeRegistry() + RefinedStorageApi.INSTANCE.getUpgradeRegistry() )); registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); this.range = data.range(); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java index 97d680053..4e211ab69 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java @@ -1,7 +1,6 @@ package com.refinedmods.refinedstorage.common.wirelesstransmitter; import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage.common.api.support.network.ConnectionLogic; import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemPlayerValidator; import com.refinedmods.refinedstorage.common.support.network.InWorldNetworkNodeContainerImpl; @@ -17,8 +16,8 @@ class WirelessTransmitterNetworkNodeContainer extends InWorldNetworkNodeContaine WirelessTransmitterNetworkNodeContainer(final WirelessTransmitterBlockEntity blockEntity, final AbstractNetworkNode node, final String name, - final ConnectionLogic connectionLogic) { - super(blockEntity, node, name, 0, connectionLogic, null); + final WirelessTransmitterConnectionStrategy connectionStrategy) { + super(blockEntity, node, name, 0, connectionStrategy, null); this.blockEntity = blockEntity; this.node = node; } diff --git a/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/NullableType.java b/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/NullableType.java new file mode 100644 index 000000000..47f3cc15f --- /dev/null +++ b/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/NullableType.java @@ -0,0 +1,13 @@ +package com.refinedmods.refinedstorage.api.core; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import javax.annotation.Nullable; + +@Nullable +@Target({ElementType.TYPE_USE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface NullableType { +} diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ModInitializerImpl.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ModInitializerImpl.java index 44aed0ea0..d45cd2fc4 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ModInitializerImpl.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ModInitializerImpl.java @@ -2,7 +2,7 @@ import com.refinedmods.refinedstorage.common.AbstractModInitializer; import com.refinedmods.refinedstorage.common.PlatformProxy; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.RefinedStoragePlugin; import com.refinedmods.refinedstorage.common.content.BlockEntities; import com.refinedmods.refinedstorage.common.content.BlockEntityTypeFactory; @@ -156,26 +156,26 @@ public void onInitialize() { final List pluginEntrypoints = FabricLoader.getInstance() .getEntrypoints(PLUGIN_ENTRYPOINT_KEY, RefinedStoragePlugin.class); LOGGER.debug("Loading {} Refined Storage plugin entrypoints.", pluginEntrypoints.size()); - pluginEntrypoints.forEach(plugin -> plugin.onPlatformApiAvailable(PlatformApi.INSTANCE)); + pluginEntrypoints.forEach(plugin -> plugin.onApiAvailable(RefinedStorageApi.INSTANCE)); LOGGER.debug("Refined Storage has loaded."); } private void registerAdditionalGridInsertionStrategyFactories() { - PlatformApi.INSTANCE.addGridInsertionStrategyFactory(FluidGridInsertionStrategy::new); + RefinedStorageApi.INSTANCE.addGridInsertionStrategyFactory(FluidGridInsertionStrategy::new); } private void registerGridExtractionStrategyFactories() { - PlatformApi.INSTANCE.addGridExtractionStrategyFactory(ItemGridExtractionStrategy::new); - PlatformApi.INSTANCE.addGridExtractionStrategyFactory(FluidGridExtractionStrategy::new); + RefinedStorageApi.INSTANCE.addGridExtractionStrategyFactory(ItemGridExtractionStrategy::new); + RefinedStorageApi.INSTANCE.addGridExtractionStrategyFactory(FluidGridExtractionStrategy::new); } private void registerGridScrollingStrategyFactories() { - PlatformApi.INSTANCE.addGridScrollingStrategyFactory(ItemGridScrollingStrategy::new); + RefinedStorageApi.INSTANCE.addGridScrollingStrategyFactory(ItemGridScrollingStrategy::new); } private void registerImporterTransferStrategyFactories() { - PlatformApi.INSTANCE.getImporterTransferStrategyRegistry().register( + RefinedStorageApi.INSTANCE.getImporterTransferStrategyRegistry().register( createIdentifier("item"), new FabricStorageImporterTransferStrategyFactory<>( ItemStorage.SIDED, @@ -185,7 +185,7 @@ private void registerImporterTransferStrategyFactories() { 1 ) ); - PlatformApi.INSTANCE.getImporterTransferStrategyRegistry().register( + RefinedStorageApi.INSTANCE.getImporterTransferStrategyRegistry().register( createIdentifier("fluid"), new FabricStorageImporterTransferStrategyFactory<>( FluidStorage.SIDED, @@ -198,7 +198,7 @@ private void registerImporterTransferStrategyFactories() { } private void registerExporterTransferStrategyFactories() { - PlatformApi.INSTANCE.getExporterTransferStrategyRegistry().register( + RefinedStorageApi.INSTANCE.getExporterTransferStrategyRegistry().register( createIdentifier("item"), new FabricStorageExporterTransferStrategyFactory<>( ItemStorage.SIDED, @@ -207,7 +207,7 @@ private void registerExporterTransferStrategyFactories() { 1 ) ); - PlatformApi.INSTANCE.getExporterTransferStrategyRegistry().register( + RefinedStorageApi.INSTANCE.getExporterTransferStrategyRegistry().register( createIdentifier("fluid"), new FabricStorageExporterTransferStrategyFactory<>( FluidStorage.SIDED, @@ -219,21 +219,25 @@ private void registerExporterTransferStrategyFactories() { } private void registerExternalStorageProviderFactories() { - PlatformApi.INSTANCE.addExternalStorageProviderFactory(new InterfacePlatformExternalStorageProviderFactory()); - PlatformApi.INSTANCE.addExternalStorageProviderFactory( + RefinedStorageApi.INSTANCE.addExternalStorageProviderFactory( + new InterfacePlatformExternalStorageProviderFactory() + ); + RefinedStorageApi.INSTANCE.addExternalStorageProviderFactory( new FabricStoragePlatformExternalStorageProviderFactory<>( ItemStorage.SIDED, VariantUtil::ofItemVariant, resource -> resource instanceof ItemResource itemResource ? toItemVariant(itemResource) : null - )); - PlatformApi.INSTANCE.addExternalStorageProviderFactory( + ) + ); + RefinedStorageApi.INSTANCE.addExternalStorageProviderFactory( new FabricStoragePlatformExternalStorageProviderFactory<>( FluidStorage.SIDED, VariantUtil::ofFluidVariant, resource -> resource instanceof FluidResource fluidResource ? toFluidVariant(fluidResource) : null - )); + ) + ); } private void registerContent() { @@ -283,7 +287,7 @@ public MenuType create(final MenuSupplie private void registerCustomItems(final RegistryCallback callback) { Items.INSTANCE.setRegulatorUpgrade(callback.register(REGULATOR_UPGRADE, () -> new RegulatorUpgradeItem( - PlatformApi.INSTANCE.getUpgradeRegistry() + RefinedStorageApi.INSTANCE.getUpgradeRegistry() ) { @Override public boolean allowComponentsUpdateAnimation(final Player player, diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/PlatformImpl.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/PlatformImpl.java index 6e3fe4e50..c40a7e342 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/PlatformImpl.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/PlatformImpl.java @@ -6,6 +6,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.common.AbstractPlatform; import com.refinedmods.refinedstorage.common.Config; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; import com.refinedmods.refinedstorage.common.api.support.resource.FluidOperationResult; import com.refinedmods.refinedstorage.common.support.containermenu.TransferManager; import com.refinedmods.refinedstorage.common.support.resource.FluidResource; @@ -89,7 +90,9 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.block.LiquidBlockContainer; +import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.chunk.LevelChunk; import net.minecraft.world.level.gameevent.GameEvent; import net.minecraft.world.level.material.FlowingFluid; import net.minecraft.world.level.material.Fluid; @@ -233,7 +236,6 @@ public ItemStack getCloneItemStack(final BlockState state, return state.getBlock().getCloneItemStack(level, hitResult.getBlockPos(), state); } - @Override public NonNullList getRemainingCraftingItems(final Player player, final CraftingRecipe craftingRecipe, @@ -429,6 +431,46 @@ public void saveSavedData(final SavedData savedData, savedData.setDirty(false); } + @Nullable + @Override + public NetworkNodeContainerProvider getContainerProvider(final Level level, + final BlockPos pos, + @Nullable final Direction direction) { + final var blockEntity = level.getBlockEntity(pos); + if (blockEntity instanceof NetworkNodeContainerProvider provider) { + return provider; + } + return null; + } + + @Nullable + @Override + public NetworkNodeContainerProvider getContainerProviderSafely(final Level level, + final BlockPos pos, + @Nullable final Direction direction) { + if (!level.isLoaded(pos)) { + return null; + } + // Avoid using EntityCreationType.IMMEDIATE. + // By default, the block is removed first and then the block entity (see BaseBlock#onRemove). + // But, when using mods like "Carrier", "Carpet" or "Carry On" that allow for moving block entities, + // they remove the block entity first and then the block. + // When removing a block with Carrier for example, + // this causes a problematic situation that the block entity IS gone, + // but that the #getBlockEntity() call here with type IMMEDIATE would recreate the block entity because + // the block is still there. + // If the block entity is returned here again even if it is removed, the preconditions in NetworkBuilder will + // fail as the "removed" block entity/connection would still be present. + final BlockEntity safeBlockEntity = level.getChunkAt(pos).getBlockEntity( + pos, + LevelChunk.EntityCreationType.CHECK + ); + if (!(safeBlockEntity instanceof NetworkNodeContainerProvider provider)) { + return null; + } + return provider; + } + private void doSave(final CompoundTag compoundTag, final Path tempFile, final Path targetPath) throws IOException { // Write to temp file first. NbtIo.writeCompressed(compoundTag, tempFile); diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java index c68b46b43..21cdd0551 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java @@ -3,8 +3,8 @@ import com.refinedmods.refinedstorage.api.network.impl.node.exporter.ExporterTransferStrategyImpl; import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.exporter.ExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import com.refinedmods.refinedstorage.common.content.Items; import com.refinedmods.refinedstorage.common.exporter.FuzzyExporterTransferStrategy; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/FabricStorageImporterTransferStrategyFactory.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/FabricStorageImporterTransferStrategyFactory.java index f4707ae97..b3ecf4120 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/FabricStorageImporterTransferStrategyFactory.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/importer/FabricStorageImporterTransferStrategyFactory.java @@ -4,8 +4,8 @@ import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterTransferStrategyImpl; import com.refinedmods.refinedstorage.api.network.node.importer.ImporterTransferStrategy; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.importer.ImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import com.refinedmods.refinedstorage.common.content.Items; diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/security/NetworkNodeBreakSecurityEventListener.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/security/NetworkNodeBreakSecurityEventListener.java index 9a2a8a586..2ddc31be1 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/security/NetworkNodeBreakSecurityEventListener.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/security/NetworkNodeBreakSecurityEventListener.java @@ -1,7 +1,8 @@ package com.refinedmods.refinedstorage.fabric.security; -import com.refinedmods.refinedstorage.common.api.PlatformApi; -import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.Platform; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; import javax.annotation.Nullable; @@ -22,10 +23,13 @@ public boolean beforeBlockBreak(final Level world, final BlockPos pos, final BlockState state, @Nullable final BlockEntity blockEntity) { - if (blockEntity instanceof NetworkNodeContainerBlockEntity networkNodeContainerBlockEntity - && player instanceof ServerPlayer serverPlayer - && !networkNodeContainerBlockEntity.canBuild(serverPlayer)) { - PlatformApi.INSTANCE.sendNoPermissionMessage( + final NetworkNodeContainerProvider provider = Platform.INSTANCE.getContainerProvider( + world, + pos, + player.getDirection().getOpposite() // TODO check + ); + if (provider != null && player instanceof ServerPlayer serverPlayer && !provider.canBuild(serverPlayer)) { + RefinedStorageApi.INSTANCE.sendNoPermissionMessage( serverPlayer, createTranslation("misc", "no_permission.build.break", state.getBlock().getName()) ); diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskdrive/DiskDriveUnbakedModel.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskdrive/DiskDriveUnbakedModel.java index 243122d0b..a6e02f845 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskdrive/DiskDriveUnbakedModel.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskdrive/DiskDriveUnbakedModel.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.fabric.storage.diskdrive; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.fabric.support.render.QuadRotators; import java.util.Collection; @@ -38,14 +38,14 @@ public Collection getDependencies() { final Set dependencies = new HashSet<>(); dependencies.add(BASE_MODEL); dependencies.add(LED_INACTIVE_MODEL); - dependencies.addAll(PlatformApi.INSTANCE.getStorageContainerItemHelper().getDiskModels()); + dependencies.addAll(RefinedStorageApi.INSTANCE.getStorageContainerItemHelper().getDiskModels()); return dependencies; } @Override public void resolveParents(final Function modelGetter) { modelGetter.apply(BASE_MODEL).resolveParents(modelGetter); - PlatformApi.INSTANCE.getStorageContainerItemHelper().getDiskModels().forEach( + RefinedStorageApi.INSTANCE.getStorageContainerItemHelper().getDiskModels().forEach( diskModel -> modelGetter.apply(diskModel).resolveParents(modelGetter) ); modelGetter.apply(LED_INACTIVE_MODEL).resolveParents(modelGetter); @@ -56,7 +56,7 @@ public void resolveParents(final Function modelG public BakedModel bake(final ModelBaker baker, final Function spriteGetter, final ModelState state) { - final Map diskModels = PlatformApi.INSTANCE.getStorageContainerItemHelper() + final Map diskModels = RefinedStorageApi.INSTANCE.getStorageContainerItemHelper() .getDiskModelsByItem() .entrySet() .stream() diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java index 058e43ff4..ef4d4b1f3 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.fabric.storage.diskinterface; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.fabric.support.render.QuadRotators; import java.util.Collection; @@ -44,7 +44,7 @@ public Collection getDependencies() { dependencies.add(baseModel); dependencies.add(INACTIVE_MODEL); dependencies.add(LED_INACTIVE_MODEL); - dependencies.addAll(PlatformApi.INSTANCE.getStorageContainerItemHelper().getDiskModels()); + dependencies.addAll(RefinedStorageApi.INSTANCE.getStorageContainerItemHelper().getDiskModels()); return dependencies; } @@ -52,7 +52,7 @@ public Collection getDependencies() { public void resolveParents(final Function modelGetter) { modelGetter.apply(baseModel).resolveParents(modelGetter); modelGetter.apply(INACTIVE_MODEL).resolveParents(modelGetter); - PlatformApi.INSTANCE.getStorageContainerItemHelper().getDiskModels().forEach( + RefinedStorageApi.INSTANCE.getStorageContainerItemHelper().getDiskModels().forEach( diskModel -> modelGetter.apply(diskModel).resolveParents(modelGetter) ); modelGetter.apply(LED_INACTIVE_MODEL).resolveParents(modelGetter); @@ -63,7 +63,7 @@ public void resolveParents(final Function modelG public BakedModel bake(final ModelBaker baker, final Function spriteGetter, final ModelState state) { - final Map diskModels = PlatformApi.INSTANCE.getStorageContainerItemHelper() + final Map diskModels = RefinedStorageApi.INSTANCE.getStorageContainerItemHelper() .getDiskModelsByItem() .entrySet() .stream() diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/PortableGridUnbakedModel.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/PortableGridUnbakedModel.java index 9758e7396..1cafd0d1a 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/PortableGridUnbakedModel.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/storage/portablegrid/PortableGridUnbakedModel.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.fabric.storage.portablegrid; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.fabric.support.render.QuadRotators; import java.util.Collection; @@ -48,7 +48,7 @@ public void resolveParents(final Function modelG modelGetter.apply(NORMAL_LED_MODEL).resolveParents(modelGetter); modelGetter.apply(NEAR_CAPACITY_LED_MODEL).resolveParents(modelGetter); modelGetter.apply(FULL_LED_MODEL).resolveParents(modelGetter); - PlatformApi.INSTANCE.getStorageContainerItemHelper().getDiskModels().forEach( + RefinedStorageApi.INSTANCE.getStorageContainerItemHelper().getDiskModels().forEach( diskModel -> modelGetter.apply(diskModel).resolveParents(modelGetter) ); } @@ -57,7 +57,7 @@ public void resolveParents(final Function modelG public BakedModel bake(final ModelBaker baker, final Function spriteGetter, final ModelState state) { - final Map diskModels = PlatformApi.INSTANCE.getStorageContainerItemHelper() + final Map diskModels = RefinedStorageApi.INSTANCE.getStorageContainerItemHelper() .getDiskModelsByItem() .entrySet() .stream() diff --git a/refinedstorage-neoforge-api/build.gradle.kts b/refinedstorage-neoforge-api/build.gradle.kts new file mode 100644 index 000000000..c0f4728ef --- /dev/null +++ b/refinedstorage-neoforge-api/build.gradle.kts @@ -0,0 +1,16 @@ +plugins { + id("refinedarchitect.neoforge") +} + +refinedarchitect { + neoForge() +} + +dependencies { + api(libs.apiguardian) + api(project(":refinedstorage-common-api")) +} + +base { + archivesName.set("refinedstorage-neoforge-api") +} diff --git a/refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/ProxyRefinedStorageNeoForgeApi.java b/refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/ProxyRefinedStorageNeoForgeApi.java new file mode 100644 index 000000000..1f68323c9 --- /dev/null +++ b/refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/ProxyRefinedStorageNeoForgeApi.java @@ -0,0 +1,32 @@ +package com.refinedmods.refinedstorage.neoforge.api; + +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; + +import javax.annotation.Nullable; + +import net.minecraft.core.Direction; +import net.neoforged.neoforge.capabilities.BlockCapability; + +public class ProxyRefinedStorageNeoForgeApi implements RefinedStorageNeoForgeApi { + @Nullable + private RefinedStorageNeoForgeApi delegate; + + public void setDelegate(final RefinedStorageNeoForgeApi delegate) { + if (this.delegate != null) { + throw new IllegalStateException("NeoForge API already injected"); + } + this.delegate = delegate; + } + + @Override + public BlockCapability getNetworkNodeContainerProviderCapability() { + return ensureLoaded().getNetworkNodeContainerProviderCapability(); + } + + private RefinedStorageNeoForgeApi ensureLoaded() { + if (delegate == null) { + throw new IllegalStateException("NeoForge API not loaded yet"); + } + return delegate; + } +} diff --git a/refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/RefinedStorageNeoForgeApi.java b/refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/RefinedStorageNeoForgeApi.java new file mode 100644 index 000000000..ba2137596 --- /dev/null +++ b/refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/RefinedStorageNeoForgeApi.java @@ -0,0 +1,15 @@ +package com.refinedmods.refinedstorage.neoforge.api; + +import com.refinedmods.refinedstorage.api.core.NullableType; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; + +import net.minecraft.core.Direction; +import net.neoforged.neoforge.capabilities.BlockCapability; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.13") +public interface RefinedStorageNeoForgeApi { + RefinedStorageNeoForgeApi INSTANCE = new ProxyRefinedStorageNeoForgeApi(); + + BlockCapability getNetworkNodeContainerProviderCapability(); +} diff --git a/refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/package-info.java b/refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/package-info.java new file mode 100644 index 000000000..138971566 --- /dev/null +++ b/refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.neoforge.api; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-neoforge/build.gradle.kts b/refinedstorage-neoforge/build.gradle.kts index 846e7171e..d8bfbe328 100644 --- a/refinedstorage-neoforge/build.gradle.kts +++ b/refinedstorage-neoforge/build.gradle.kts @@ -9,6 +9,7 @@ refinedarchitect { dataGeneration(project(":refinedstorage-common")) compileWithProject(project(":refinedstorage-common")) compileWithProject(project(":refinedstorage-common-api")) + compileWithProject(project(":refinedstorage-neoforge-api")) compileWithProject(project(":refinedstorage-core-api")) compileWithProject(project(":refinedstorage-resource-api")) compileWithProject(project(":refinedstorage-storage-api")) diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ModInitializer.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ModInitializer.java index ac4d243a8..2dd549f64 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ModInitializer.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ModInitializer.java @@ -1,9 +1,11 @@ package com.refinedmods.refinedstorage.neoforge; import com.refinedmods.refinedstorage.common.AbstractModInitializer; +import com.refinedmods.refinedstorage.common.Platform; import com.refinedmods.refinedstorage.common.PlatformProxy; -import com.refinedmods.refinedstorage.common.api.PlatformApi; -import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; +import com.refinedmods.refinedstorage.common.api.support.network.AbstractNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; import com.refinedmods.refinedstorage.common.content.BlockEntities; import com.refinedmods.refinedstorage.common.content.BlockEntityTypeFactory; import com.refinedmods.refinedstorage.common.content.Blocks; @@ -18,6 +20,8 @@ import com.refinedmods.refinedstorage.common.iface.InterfacePlatformExternalStorageProviderFactory; import com.refinedmods.refinedstorage.common.security.FallbackSecurityCardItem; import com.refinedmods.refinedstorage.common.security.SecurityCardItem; +import com.refinedmods.refinedstorage.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.common.storage.ItemStorageVariant; import com.refinedmods.refinedstorage.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridBlockItem; import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridType; @@ -50,6 +54,8 @@ import com.refinedmods.refinedstorage.common.upgrade.RegulatorUpgradeItem; import com.refinedmods.refinedstorage.common.util.IdentifierUtil; import com.refinedmods.refinedstorage.common.util.ServerEventQueue; +import com.refinedmods.refinedstorage.neoforge.api.ProxyRefinedStorageNeoForgeApi; +import com.refinedmods.refinedstorage.neoforge.api.RefinedStorageNeoForgeApi; import com.refinedmods.refinedstorage.neoforge.exporter.FluidHandlerExporterTransferStrategyFactory; import com.refinedmods.refinedstorage.neoforge.exporter.ItemHandlerExporterTransferStrategyFactory; import com.refinedmods.refinedstorage.neoforge.grid.strategy.FluidGridExtractionStrategy; @@ -147,6 +153,9 @@ public class ModInitializer extends AbstractModInitializer { public ModInitializer(final IEventBus eventBus, final ModContainer modContainer) { PlatformProxy.loadPlatform(new PlatformImpl(modContainer)); initializePlatformApi(); + ((ProxyRefinedStorageNeoForgeApi) RefinedStorageNeoForgeApi.INSTANCE).setDelegate( + new RefinedStorageNeoForgeApiImpl() + ); registerAdditionalGridInsertionStrategyFactories(); registerGridExtractionStrategyFactories(); registerGridScrollingStrategyFactories(); @@ -177,44 +186,46 @@ public ModInitializer(final IEventBus eventBus, final ModContainer modContainer) } private void registerAdditionalGridInsertionStrategyFactories() { - PlatformApi.INSTANCE.addGridInsertionStrategyFactory(FluidGridInsertionStrategy::new); + RefinedStorageApi.INSTANCE.addGridInsertionStrategyFactory(FluidGridInsertionStrategy::new); } private void registerGridExtractionStrategyFactories() { - PlatformApi.INSTANCE.addGridExtractionStrategyFactory(ItemGridExtractionStrategy::new); - PlatformApi.INSTANCE.addGridExtractionStrategyFactory(FluidGridExtractionStrategy::new); + RefinedStorageApi.INSTANCE.addGridExtractionStrategyFactory(ItemGridExtractionStrategy::new); + RefinedStorageApi.INSTANCE.addGridExtractionStrategyFactory(FluidGridExtractionStrategy::new); } private void registerGridScrollingStrategyFactories() { - PlatformApi.INSTANCE.addGridScrollingStrategyFactory(ItemGridScrollingStrategy::new); + RefinedStorageApi.INSTANCE.addGridScrollingStrategyFactory(ItemGridScrollingStrategy::new); } private void registerImporterTransferStrategyFactories() { - PlatformApi.INSTANCE.getImporterTransferStrategyRegistry().register( + RefinedStorageApi.INSTANCE.getImporterTransferStrategyRegistry().register( createIdentifier("item"), new ItemHandlerImporterTransferStrategyFactory() ); - PlatformApi.INSTANCE.getImporterTransferStrategyRegistry().register( + RefinedStorageApi.INSTANCE.getImporterTransferStrategyRegistry().register( createIdentifier("fluid"), new FluidHandlerImporterTransferStrategyFactory() ); } private void registerExporterTransferStrategyFactories() { - PlatformApi.INSTANCE.getExporterTransferStrategyRegistry().register( + RefinedStorageApi.INSTANCE.getExporterTransferStrategyRegistry().register( createIdentifier("item"), new ItemHandlerExporterTransferStrategyFactory() ); - PlatformApi.INSTANCE.getExporterTransferStrategyRegistry().register( + RefinedStorageApi.INSTANCE.getExporterTransferStrategyRegistry().register( createIdentifier("fluid"), new FluidHandlerExporterTransferStrategyFactory() ); } private void registerExternalStorageProviderFactories() { - PlatformApi.INSTANCE.addExternalStorageProviderFactory(new InterfacePlatformExternalStorageProviderFactory()); - PlatformApi.INSTANCE.addExternalStorageProviderFactory(new ItemHandlerPlatformExternalStorageProviderFactory()); - PlatformApi.INSTANCE.addExternalStorageProviderFactory( + RefinedStorageApi.INSTANCE.addExternalStorageProviderFactory( + new InterfacePlatformExternalStorageProviderFactory()); + RefinedStorageApi.INSTANCE.addExternalStorageProviderFactory( + new ItemHandlerPlatformExternalStorageProviderFactory()); + RefinedStorageApi.INSTANCE.addExternalStorageProviderFactory( new FluidHandlerPlatformExternalStorageProviderFactory() ); } @@ -247,7 +258,7 @@ private void registerItems(final IEventBus eventBus) { private void registerCustomItems(final RegistryCallback callback) { Items.INSTANCE.setRegulatorUpgrade(callback.register(REGULATOR_UPGRADE, () -> new RegulatorUpgradeItem( - PlatformApi.INSTANCE.getUpgradeRegistry() + RefinedStorageApi.INSTANCE.getUpgradeRegistry() ) { @Override public boolean shouldCauseReequipAnimation(final ItemStack oldStack, @@ -363,6 +374,30 @@ private void registerDataComponents(final IEventBus eventBus) { } private void registerCapabilities(final RegisterCapabilitiesEvent event) { + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getCable()); + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getConstructor()); + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getController()); + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getCraftingGrid()); + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getCreativeController()); + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getDestructor()); + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getDetector()); + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getDiskDrive()); + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getDiskInterface()); + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getExporter()); + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getExternalStorage()); + Arrays.stream(FluidStorageVariant.values()).forEach(type -> + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getFluidStorageBlock(type))); + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getGrid()); + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getImporter()); + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getInterface()); + Arrays.stream(ItemStorageVariant.values()).forEach(type -> + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getItemStorageBlock(type))); + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getNetworkReceiver()); + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getNetworkTransmitter()); + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getRelay()); + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getSecurityManager()); + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getStorageMonitor()); + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getWirelessTransmitter()); event.registerBlockEntity( Capabilities.ItemHandler.BLOCK, BlockEntities.INSTANCE.getDiskDrive(), @@ -424,6 +459,17 @@ private void registerCapabilities(final RegisterCapabilitiesEvent event) { ); } + private void registerNetworkNodeContainerProvider( + final RegisterCapabilitiesEvent event, + final BlockEntityType> type + ) { + event.registerBlockEntity( + RefinedStorageNeoForgeApi.INSTANCE.getNetworkNodeContainerProviderCapability(), + type, + (be, side) -> be.getContainerProvider() + ); + } + private void registerSounds(final IEventBus eventBus) { registerSounds(new ForgeRegistryCallback<>(soundEventRegistry)); soundEventRegistry.register(eventBus); @@ -480,12 +526,14 @@ public void registerWrenchingEvent(final PlayerInteractEvent.RightClickBlock e) @SubscribeEvent public void registerSecurityBlockBreakEvent(final BlockEvent.BreakEvent e) { - final BlockEntity blockEntity = e.getLevel().getBlockEntity(e.getPos()); - if (blockEntity instanceof NetworkNodeContainerBlockEntity networkNodeContainerBlockEntity - && e.getPlayer() instanceof ServerPlayer serverPlayer - && !networkNodeContainerBlockEntity.canBuild(serverPlayer)) { - PlatformApi.INSTANCE.sendNoPermissionMessage( - serverPlayer, + final NetworkNodeContainerProvider provider = Platform.INSTANCE.getContainerProvider( + (Level) e.getLevel(), // TODO: change. + e.getPos(), + e.getPlayer().getDirection().getOpposite() // TODO check + ); + if (provider != null && e.getPlayer() instanceof ServerPlayer srvrPlayer && !provider.canBuild(srvrPlayer)) { + RefinedStorageApi.INSTANCE.sendNoPermissionMessage( + srvrPlayer, createTranslation("misc", "no_permission.build.break", e.getState().getBlock().getName()) ); e.setCanceled(true); diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/PlatformImpl.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/PlatformImpl.java index 746d1c9b3..fdedb8562 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/PlatformImpl.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/PlatformImpl.java @@ -6,6 +6,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.common.AbstractPlatform; import com.refinedmods.refinedstorage.common.Config; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; import com.refinedmods.refinedstorage.common.api.support.resource.FluidOperationResult; import com.refinedmods.refinedstorage.common.support.containermenu.TransferManager; import com.refinedmods.refinedstorage.common.support.resource.FluidResource; @@ -59,7 +60,9 @@ import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.LiquidBlock; +import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.chunk.LevelChunk; import net.minecraft.world.level.saveddata.SavedData; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; @@ -349,4 +352,49 @@ public void saveSavedData(final SavedData savedData, final BiConsumer defaultSaveFunction) { defaultSaveFunction.accept(file, provider); } + + @Override + public NetworkNodeContainerProvider getContainerProvider(final Level level, + final BlockPos pos, + @Nullable final Direction direction) { + return level.getCapability( + RefinedStorageNeoForgeApiImpl.INSTANCE.getNetworkNodeContainerProviderCapability(), + pos, + direction + ); + } + + @Nullable + @Override + public NetworkNodeContainerProvider getContainerProviderSafely(final Level level, + final BlockPos pos, + @Nullable final Direction direction) { + if (!level.isLoaded(pos)) { + return null; + } + // Avoid using EntityCreationType.IMMEDIATE. + // By default, the block is removed first and then the block entity (see BaseBlock#onRemove). + // But, when using mods like "Carrier", "Carpet" or "Carry On" that allow for moving block entities, + // they remove the block entity first and then the block. + // When removing a block with Carrier for example, + // this causes a problematic situation that the block entity IS gone, + // but that the #getBlockEntity() call here with type IMMEDIATE would recreate the block entity because + // the block is still there. + // If the block entity is returned here again even if it is removed, the preconditions in NetworkBuilder will + // fail as the "removed" block entity/connection would still be present. + final BlockEntity safeBlockEntity = level.getChunkAt(pos).getBlockEntity( + pos, + LevelChunk.EntityCreationType.CHECK + ); + if (safeBlockEntity == null) { + return null; + } + return level.getCapability( + RefinedStorageNeoForgeApiImpl.INSTANCE.getNetworkNodeContainerProviderCapability(), + pos, + null, + safeBlockEntity, + direction + ); + } } diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/RefinedStorageNeoForgeApiImpl.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/RefinedStorageNeoForgeApiImpl.java new file mode 100644 index 000000000..16e430b23 --- /dev/null +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/RefinedStorageNeoForgeApiImpl.java @@ -0,0 +1,24 @@ +package com.refinedmods.refinedstorage.neoforge; + +import com.refinedmods.refinedstorage.api.core.NullableType; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; +import com.refinedmods.refinedstorage.neoforge.api.RefinedStorageNeoForgeApi; + +import net.minecraft.core.Direction; +import net.neoforged.neoforge.capabilities.BlockCapability; + +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; + +public class RefinedStorageNeoForgeApiImpl implements RefinedStorageNeoForgeApi { + private final BlockCapability + networkNodeContainerProviderCapability = BlockCapability.create( + createIdentifier("network_node_container_provider"), + NetworkNodeContainerProvider.class, + Direction.class + ); + + @Override + public BlockCapability getNetworkNodeContainerProviderCapability() { + return networkNodeContainerProviderCapability; + } +} diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/FluidHandlerExporterTransferStrategyFactory.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/FluidHandlerExporterTransferStrategyFactory.java index c06cff848..ad07f47fc 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/FluidHandlerExporterTransferStrategyFactory.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/FluidHandlerExporterTransferStrategyFactory.java @@ -3,8 +3,8 @@ import com.refinedmods.refinedstorage.api.network.impl.node.exporter.ExporterTransferStrategyImpl; import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; import com.refinedmods.refinedstorage.common.Platform; -import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.exporter.ExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import com.refinedmods.refinedstorage.common.content.Items; import com.refinedmods.refinedstorage.common.exporter.FuzzyExporterTransferStrategy; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/ItemHandlerExporterTransferStrategyFactory.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/ItemHandlerExporterTransferStrategyFactory.java index 26ed97585..d9db82c0e 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/ItemHandlerExporterTransferStrategyFactory.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/exporter/ItemHandlerExporterTransferStrategyFactory.java @@ -2,8 +2,8 @@ import com.refinedmods.refinedstorage.api.network.impl.node.exporter.ExporterTransferStrategyImpl; import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; -import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.exporter.ExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import com.refinedmods.refinedstorage.common.content.Items; import com.refinedmods.refinedstorage.common.exporter.FuzzyExporterTransferStrategy; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridExtractionStrategy.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridExtractionStrategy.java index f947bcde0..257bfe7db 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridExtractionStrategy.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridExtractionStrategy.java @@ -2,9 +2,9 @@ import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.grid.Grid; import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import com.refinedmods.refinedstorage.common.support.resource.ResourceTypes; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridInsertionStrategy.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridInsertionStrategy.java index c28d718fb..690cf8524 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridInsertionStrategy.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridInsertionStrategy.java @@ -2,9 +2,9 @@ import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.grid.Grid; import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import com.refinedmods.refinedstorage.common.support.resource.ResourceTypes; import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCache; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridScrollingStrategy.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridScrollingStrategy.java index 5b83eeea1..690cb7f32 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridScrollingStrategy.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/grid/strategy/ItemGridScrollingStrategy.java @@ -3,10 +3,10 @@ import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.grid.Grid; import com.refinedmods.refinedstorage.common.api.grid.GridScrollMode; import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey; import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import com.refinedmods.refinedstorage.common.support.resource.ResourceTypes; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/FluidHandlerImporterTransferStrategyFactory.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/FluidHandlerImporterTransferStrategyFactory.java index 127a9e9e9..3665e2cf7 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/FluidHandlerImporterTransferStrategyFactory.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/FluidHandlerImporterTransferStrategyFactory.java @@ -3,8 +3,8 @@ import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterSource; import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterTransferStrategyImpl; import com.refinedmods.refinedstorage.api.network.node.importer.ImporterTransferStrategy; -import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.importer.ImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import com.refinedmods.refinedstorage.common.content.Items; import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCacheImpl; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/ItemHandlerImporterTransferStrategyFactory.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/ItemHandlerImporterTransferStrategyFactory.java index 1c63e1786..981d3b9da 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/ItemHandlerImporterTransferStrategyFactory.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/importer/ItemHandlerImporterTransferStrategyFactory.java @@ -3,8 +3,8 @@ import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterSource; import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterTransferStrategyImpl; import com.refinedmods.refinedstorage.api.network.node.importer.ImporterTransferStrategy; -import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.importer.ImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.common.api.support.network.AmountOverride; import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeState; import com.refinedmods.refinedstorage.common.content.Items; import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCacheImpl; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/DiskDriveUnbakedGeometry.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/DiskDriveUnbakedGeometry.java index ebdd2999e..f50a5a1fb 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/DiskDriveUnbakedGeometry.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskdrive/DiskDriveUnbakedGeometry.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.neoforge.storage.diskdrive; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.neoforge.support.render.DiskModelBaker; import com.refinedmods.refinedstorage.neoforge.support.render.RotationTranslationModelBaker; @@ -31,7 +31,7 @@ public class DiskDriveUnbakedGeometry implements IUnbakedGeometry modelGetter, final IGeometryBakingContext context) { modelGetter.apply(BASE_MODEL).resolveParents(modelGetter); - PlatformApi.INSTANCE.getStorageContainerItemHelper().getDiskModels().forEach( + RefinedStorageApi.INSTANCE.getStorageContainerItemHelper().getDiskModels().forEach( diskModel -> modelGetter.apply(diskModel).resolveParents(modelGetter) ); modelGetter.apply(LED_INACTIVE_MODEL).resolveParents(modelGetter); diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java index db2c67c15..af3d01e45 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.neoforge.storage.diskinterface; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.neoforge.support.render.DiskModelBaker; import com.refinedmods.refinedstorage.neoforge.support.render.RotationTranslationModelBaker; @@ -36,7 +36,7 @@ public void resolveParents(final Function modelG final IGeometryBakingContext context) { modelGetter.apply(baseModel).resolveParents(modelGetter); modelGetter.apply(INACTIVE_MODEL).resolveParents(modelGetter); - PlatformApi.INSTANCE.getStorageContainerItemHelper().getDiskModels().forEach( + RefinedStorageApi.INSTANCE.getStorageContainerItemHelper().getDiskModels().forEach( diskModel -> modelGetter.apply(diskModel).resolveParents(modelGetter) ); modelGetter.apply(LED_INACTIVE_MODEL).resolveParents(modelGetter); diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/PortableGridUnbakedGeometry.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/PortableGridUnbakedGeometry.java index b43367d0b..38531d03e 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/PortableGridUnbakedGeometry.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/storage/portablegrid/PortableGridUnbakedGeometry.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.neoforge.storage.portablegrid; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.neoforge.support.render.DiskModelBaker; import com.refinedmods.refinedstorage.neoforge.support.render.RotationTranslationModelBaker; @@ -40,7 +40,7 @@ public void resolveParents(final Function modelG modelGetter.apply(NORMAL_LED_MODEL).resolveParents(modelGetter); modelGetter.apply(NEAR_CAPACITY_LED_MODEL).resolveParents(modelGetter); modelGetter.apply(FULL_LED_MODEL).resolveParents(modelGetter); - PlatformApi.INSTANCE.getStorageContainerItemHelper().getDiskModels().forEach( + RefinedStorageApi.INSTANCE.getStorageContainerItemHelper().getDiskModels().forEach( diskModel -> modelGetter.apply(diskModel).resolveParents(modelGetter) ); } diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/DiskModelBaker.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/DiskModelBaker.java index 085cef3f6..6f7a5afad 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/DiskModelBaker.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/support/render/DiskModelBaker.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.neoforge.support.render; -import com.refinedmods.refinedstorage.common.api.PlatformApi; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import java.util.Map; import java.util.function.Function; @@ -19,7 +19,7 @@ public class DiskModelBaker { public DiskModelBaker(final ModelState state, final ModelBaker baker, final Function spriteGetter) { - this.bakers = PlatformApi.INSTANCE.getStorageContainerItemHelper() + this.bakers = RefinedStorageApi.INSTANCE.getStorageContainerItemHelper() .getDiskModelsByItem() .entrySet() .stream() diff --git a/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/GameTestUtil.java b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/GameTestUtil.java index 9b9ed962f..fee7f5328 100644 --- a/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/GameTestUtil.java +++ b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/GameTestUtil.java @@ -47,7 +47,7 @@ private GameTestUtil() { private static Network getNetwork(final GameTestHelper helper, final BlockPos pos) { try { final var be = requireBlockEntity(helper, pos, AbstractNetworkNodeContainerBlockEntity.class); - final var field = AbstractNetworkNodeContainerBlockEntity.class.getDeclaredField("mainNode"); + final var field = AbstractNetworkNodeContainerBlockEntity.class.getDeclaredField("mainNetworkNode"); field.setAccessible(true); final NetworkNode mainNode = (NetworkNode) field.get(be); return mainNode.getNetwork(); diff --git a/settings.gradle.kts b/settings.gradle.kts index cf208682a..92682b741 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -54,4 +54,5 @@ include("refinedstorage-common-api") include("refinedstorage-common") include("refinedstorage-fabric") include("refinedstorage-neoforge") +include("refinedstorage-neoforge-api") include("refinedstorage-network-test") From 89db32591c30c0d4e5775ee4082f42814ef40099 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 24 Jul 2024 20:43:34 +0200 Subject: [PATCH 34/36] feat: add fabric block capability for network nodes Moves RefinedStoragePlugin to fabric-api module as it's only needed for Fabric. --- .github/CONTRIBUTING.md | 1 + .github/workflows/build.yml | 2 +- .github/workflows/draft-release.yml | 2 +- .../issue-for-unsupported-version.yml | 2 +- .github/workflows/publish-release.yml | 2 +- .github/workflows/resolved-issue-locking.yml | 2 +- .github/workflows/validate-branch-name.yml | 2 +- .github/workflows/validate-changelog.yml | 2 +- .../workflows/validate-commit-messages.yml | 2 +- build.gradle.kts | 11 ++++- gradle.properties | 2 +- .../common/api/RefinedStoragePlugin.java | 11 ----- .../refinedstorage/common/PlatformProxy.java | 4 +- .../common/support/AbstractBaseBlock.java | 3 +- .../common/support/CableBlockSupport.java | 20 ++++---- .../BaseNetworkNodeContainerBlockEntity.java | 7 ++- .../InWorldNetworkNodeContainerImpl.java | 2 +- .../NetworkNodeContainerProviderImpl.java | 2 +- .../refinedstorage/common/TestPlatform.java | 15 ++++++ refinedstorage-fabric-api/build.gradle.kts | 16 +++++++ .../fabric/api/RefinedStorageFabricApi.java | 15 ++++++ .../api/RefinedStorageFabricApiProxy.java | 32 +++++++++++++ .../fabric/api/RefinedStoragePlugin.java | 11 +++++ .../fabric/api/package-info.java | 7 +++ refinedstorage-fabric/build.gradle.kts | 1 + .../fabric/ModInitializerImpl.java | 48 +++++++++++++++++-- .../refinedstorage/fabric/PlatformImpl.java | 17 ++++--- .../fabric/RefinedStorageFabricApiImpl.java | 24 ++++++++++ ...NetworkNodeBreakSecurityEventListener.java | 6 +-- .../main/resources/refinedstorage.mixins.json | 12 ++--- .../grid/service/GridOperationsImplTest.java | 2 +- .../api/RefinedStorageNeoForgeApi.java | 4 +- ...va => RefinedStorageNeoForgeApiProxy.java} | 2 +- .../neoforge/ModInitializer.java | 19 ++++---- .../refinedstorage/neoforge/PlatformImpl.java | 5 +- settings.gradle.kts | 1 + 36 files changed, 242 insertions(+), 74 deletions(-) delete mode 100644 refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStoragePlugin.java create mode 100644 refinedstorage-fabric-api/build.gradle.kts create mode 100644 refinedstorage-fabric-api/src/main/java/com/refinedmods/refinedstorage/fabric/api/RefinedStorageFabricApi.java create mode 100644 refinedstorage-fabric-api/src/main/java/com/refinedmods/refinedstorage/fabric/api/RefinedStorageFabricApiProxy.java create mode 100644 refinedstorage-fabric-api/src/main/java/com/refinedmods/refinedstorage/fabric/api/RefinedStoragePlugin.java create mode 100644 refinedstorage-fabric-api/src/main/java/com/refinedmods/refinedstorage/fabric/api/package-info.java create mode 100644 refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/RefinedStorageFabricApiImpl.java rename refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/{ProxyRefinedStorageNeoForgeApi.java => RefinedStorageNeoForgeApiProxy.java} (94%) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 5cb098cfa..16ae93331 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -277,6 +277,7 @@ Minecraft. | `refinedstorage-storage-api` | ✔️ | Contains storage related functionality. | | `refinedstorage-common-api` | ✔️ | Implements the various Refined Storage API modules for use in Minecraft. | | `refinedstorage-common` | ❌ | Common mod code. Most gameplay code is in here. | +| `refinedstorage-fabric-api` | ✔️ | Additional API for the Fabric platform. | | `refinedstorage-fabric` | ❌ | The platform module for Fabric. This module contains Fabric specific code. | | `refinedstorage-neoforge-api` | ✔️ | Additional API for the NeoForge platform. | | `refinedstorage-neoforge` | ❌ | The platform module for NeoForge. This module contains NeoForge specific code and the integration tests. | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ec5d03bc..ed44fdb84 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: types: [ opened, synchronize, reopened ] jobs: build: - uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.16.8 + uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.16.9 with: gametests: true secrets: inherit diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index f005243f6..d1b6a91d4 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -17,7 +17,7 @@ on: type: string jobs: draft: - uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.16.8 + uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.16.9 with: release-type: ${{ inputs.release-type }} version-number-override: ${{ inputs.version-number-override }} diff --git a/.github/workflows/issue-for-unsupported-version.yml b/.github/workflows/issue-for-unsupported-version.yml index 2a5a4a1fb..054bce154 100644 --- a/.github/workflows/issue-for-unsupported-version.yml +++ b/.github/workflows/issue-for-unsupported-version.yml @@ -4,4 +4,4 @@ on: types: [ labeled, unlabeled, reopened ] jobs: unsupported-labeler: - uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.16.8 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.16.9 \ No newline at end of file diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 477396909..153402dbf 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -7,7 +7,7 @@ on: - closed jobs: publish-release: - uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.16.8 + uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.16.9 secrets: inherit with: project-name: 'Refined Storage' diff --git a/.github/workflows/resolved-issue-locking.yml b/.github/workflows/resolved-issue-locking.yml index bdaa9235a..fdaa760cc 100644 --- a/.github/workflows/resolved-issue-locking.yml +++ b/.github/workflows/resolved-issue-locking.yml @@ -4,4 +4,4 @@ on: - cron: '0 0 * * 1' jobs: lock: - uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.16.8 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.16.9 \ No newline at end of file diff --git a/.github/workflows/validate-branch-name.yml b/.github/workflows/validate-branch-name.yml index 52bbc124c..944aa08bb 100644 --- a/.github/workflows/validate-branch-name.yml +++ b/.github/workflows/validate-branch-name.yml @@ -2,4 +2,4 @@ name: Validate branch name on: [ pull_request ] jobs: validate-branch-name: - uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.16.8 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.16.9 \ No newline at end of file diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml index 441ebdf51..218f86e40 100644 --- a/.github/workflows/validate-changelog.yml +++ b/.github/workflows/validate-changelog.yml @@ -4,4 +4,4 @@ on: types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ] jobs: validate-changelog: - uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.16.8 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.16.9 \ No newline at end of file diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml index e15ae8c6d..b70a80db3 100644 --- a/.github/workflows/validate-commit-messages.yml +++ b/.github/workflows/validate-commit-messages.yml @@ -2,4 +2,4 @@ name: Validate commit messages on: [ pull_request ] jobs: validate-commit-messages: - uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.16.8 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.16.9 \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index b568e88fd..d99f52400 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,16 @@ project.extensions.getByType().apply { properties { property( "sonar.coverage.exclusions", - "refinedstorage-neoforge/**/*,refinedstorage-fabric/**/*,refinedstorage-common/**/*,refinedstorage-common-api/**/*" + "refinedstorage-neoforge-api/**/*,refinedstorage-neoforge/**/*,refinedstorage-fabric-api/**/*,refinedstorage-fabric/**/*,refinedstorage-common/**/*,refinedstorage-common-api/**/*" ) } } + +allprojects { + apply(plugin = "maven-publish") + publishing { + repositories { + mavenLocal() + } + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index bd3791e6f..714a71d9d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -refinedarchitectVersion=0.16.8 +refinedarchitectVersion=0.16.9 # Gradle org.gradle.jvmargs=-Xmx1G diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStoragePlugin.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStoragePlugin.java deleted file mode 100644 index 2deb79c30..000000000 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStoragePlugin.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.refinedmods.refinedstorage.common.api; - -import org.apiguardian.api.API; - -// TODO: Introduce NetworkNodeContainerProvider -// TODO: Use platform to get access to NetworkNodeProvider instead of instanceof checks. -// TODO: Rename to RS entrypoint and move to fabric-api. -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.13") -public interface RefinedStoragePlugin { - void onApiAvailable(RefinedStorageApi api); -} diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformProxy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformProxy.java index 463f34476..6c28ad8e5 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformProxy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/PlatformProxy.java @@ -242,7 +242,7 @@ public void saveSavedData(final SavedData savedData, @Override public NetworkNodeContainerProvider getContainerProvider(final Level level, final BlockPos pos, - final Direction direction) { + @Nullable final Direction direction) { return ensureLoaded().getContainerProvider(level, pos, direction); } @@ -250,7 +250,7 @@ public NetworkNodeContainerProvider getContainerProvider(final Level level, @Override public NetworkNodeContainerProvider getContainerProviderSafely(final Level level, final BlockPos pos, - final Direction direction) { + @Nullable final Direction direction) { return ensureLoaded().getContainerProviderSafely(level, pos, direction); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseBlock.java index 25b42d47f..591b5f0fc 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/AbstractBaseBlock.java @@ -180,7 +180,6 @@ private boolean dismantleOrRotate(final BlockState state, if (player.isCrouching()) { return dismantle(state, level, hitResult, player); } else { - // TODO: validate dir. return rotate(state, level, hitResult.getBlockPos(), hitResult.getDirection(), player); } } @@ -218,7 +217,7 @@ private boolean dismantle(final BlockState state, final NetworkNodeContainerProvider provider = Platform.INSTANCE.getContainerProvider( level, hitResult.getBlockPos(), - hitResult.getDirection().getOpposite() // todo verify + hitResult.getDirection() ); if (provider != null && !provider.canBuild(player)) { RefinedStorageApi.INSTANCE.sendNoPermissionMessage( diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/CableBlockSupport.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/CableBlockSupport.java index cdf0efc1d..9fcb94357 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/CableBlockSupport.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/CableBlockSupport.java @@ -85,18 +85,20 @@ private static VoxelShape calculateShape(final CableShapeCacheKey cacheKey) { public static BlockState getState( final BlockState currentState, - final LevelAccessor level, + final LevelAccessor levelAccessor, final BlockPos pos, @Nullable final Direction blacklistedDirection ) { - // TODO: change. - final Level level1 = (Level) level; - final boolean north = hasVisualConnection(currentState, level1, pos, Direction.NORTH, blacklistedDirection); - final boolean east = hasVisualConnection(currentState, level1, pos, Direction.EAST, blacklistedDirection); - final boolean south = hasVisualConnection(currentState, level1, pos, Direction.SOUTH, blacklistedDirection); - final boolean west = hasVisualConnection(currentState, level1, pos, Direction.WEST, blacklistedDirection); - final boolean up = hasVisualConnection(currentState, level1, pos, Direction.UP, blacklistedDirection); - final boolean down = hasVisualConnection(currentState, level1, pos, Direction.DOWN, blacklistedDirection); + if (!(levelAccessor instanceof Level level)) { + return currentState; + } + + final boolean north = hasVisualConnection(currentState, level, pos, Direction.NORTH, blacklistedDirection); + final boolean east = hasVisualConnection(currentState, level, pos, Direction.EAST, blacklistedDirection); + final boolean south = hasVisualConnection(currentState, level, pos, Direction.SOUTH, blacklistedDirection); + final boolean west = hasVisualConnection(currentState, level, pos, Direction.WEST, blacklistedDirection); + final boolean up = hasVisualConnection(currentState, level, pos, Direction.UP, blacklistedDirection); + final boolean down = hasVisualConnection(currentState, level, pos, Direction.DOWN, blacklistedDirection); return currentState .setValue(NORTH, north) diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/BaseNetworkNodeContainerBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/BaseNetworkNodeContainerBlockEntity.java index 85055e53a..1149a0177 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/BaseNetworkNodeContainerBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/BaseNetworkNodeContainerBlockEntity.java @@ -63,7 +63,12 @@ public void updateActiveness(final BlockState state, @Nullable final BooleanProp } protected void activenessChanged(final boolean newActive) { - LOGGER.debug("Activeness change for node at {}: {} -> {}", getBlockPos(), mainNetworkNode.isActive(), newActive); + LOGGER.debug( + "Activeness change for node at {}: {} -> {}", + getBlockPos(), + mainNetworkNode.isActive(), + newActive + ); mainNetworkNode.setActive(newActive); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/InWorldNetworkNodeContainerImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/InWorldNetworkNodeContainerImpl.java index 4d481d3a8..30b91c7f0 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/InWorldNetworkNodeContainerImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/InWorldNetworkNodeContainerImpl.java @@ -1,8 +1,8 @@ package com.refinedmods.refinedstorage.common.support.network; import com.refinedmods.refinedstorage.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage.common.api.support.network.ConnectionStrategy; import com.refinedmods.refinedstorage.common.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.common.api.support.network.ConnectionStrategy; import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer; import java.util.function.Supplier; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/NetworkNodeContainerProviderImpl.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/NetworkNodeContainerProviderImpl.java index 04a1901c8..6b88264c5 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/NetworkNodeContainerProviderImpl.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/network/NetworkNodeContainerProviderImpl.java @@ -12,7 +12,7 @@ import net.minecraft.server.level.ServerPlayer; public class NetworkNodeContainerProviderImpl implements NetworkNodeContainerProvider { - private final Set containers = new HashSet<>(1); + private final Set containers = HashSet.newHashSet(1); private final Set containersView = Collections.unmodifiableSet(containers); @Override diff --git a/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/TestPlatform.java b/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/TestPlatform.java index 85c1611aa..1a7fc620a 100644 --- a/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/TestPlatform.java +++ b/refinedstorage-common/src/test/java/com/refinedmods/refinedstorage/common/TestPlatform.java @@ -5,6 +5,7 @@ import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.common.api.grid.strategy.GridInsertionStrategyFactory; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; import com.refinedmods.refinedstorage.common.api.support.resource.FluidOperationResult; import com.refinedmods.refinedstorage.common.support.containermenu.MenuOpener; import com.refinedmods.refinedstorage.common.support.containermenu.TransferManager; @@ -212,4 +213,18 @@ public void saveSavedData(final SavedData savedData, final File file, final Hold final BiConsumer defaultSaveFunction) { throw new UnsupportedOperationException(); } + + @Nullable + @Override + public NetworkNodeContainerProvider getContainerProvider(final Level level, final BlockPos pos, + @Nullable final Direction direction) { + throw new UnsupportedOperationException(); + } + + @Nullable + @Override + public NetworkNodeContainerProvider getContainerProviderSafely(final Level level, final BlockPos pos, + @Nullable final Direction direction) { + throw new UnsupportedOperationException(); + } } diff --git a/refinedstorage-fabric-api/build.gradle.kts b/refinedstorage-fabric-api/build.gradle.kts new file mode 100644 index 000000000..108799777 --- /dev/null +++ b/refinedstorage-fabric-api/build.gradle.kts @@ -0,0 +1,16 @@ +plugins { + id("refinedarchitect.fabric") +} + +refinedarchitect { + fabric() +} + +dependencies { + compileOnly(project(":refinedstorage-common-api")) + api(libs.apiguardian) +} + +base { + archivesName.set("refinedstorage-fabric-api") +} diff --git a/refinedstorage-fabric-api/src/main/java/com/refinedmods/refinedstorage/fabric/api/RefinedStorageFabricApi.java b/refinedstorage-fabric-api/src/main/java/com/refinedmods/refinedstorage/fabric/api/RefinedStorageFabricApi.java new file mode 100644 index 000000000..557acb7ea --- /dev/null +++ b/refinedstorage-fabric-api/src/main/java/com/refinedmods/refinedstorage/fabric/api/RefinedStorageFabricApi.java @@ -0,0 +1,15 @@ +package com.refinedmods.refinedstorage.fabric.api; + +import com.refinedmods.refinedstorage.api.core.NullableType; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; + +import net.fabricmc.fabric.api.lookup.v1.block.BlockApiLookup; +import net.minecraft.core.Direction; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.4.5") +public interface RefinedStorageFabricApi { + RefinedStorageFabricApi INSTANCE = new RefinedStorageFabricApiProxy(); + + BlockApiLookup getNetworkNodeContainerProviderLookup(); +} diff --git a/refinedstorage-fabric-api/src/main/java/com/refinedmods/refinedstorage/fabric/api/RefinedStorageFabricApiProxy.java b/refinedstorage-fabric-api/src/main/java/com/refinedmods/refinedstorage/fabric/api/RefinedStorageFabricApiProxy.java new file mode 100644 index 000000000..26b313b03 --- /dev/null +++ b/refinedstorage-fabric-api/src/main/java/com/refinedmods/refinedstorage/fabric/api/RefinedStorageFabricApiProxy.java @@ -0,0 +1,32 @@ +package com.refinedmods.refinedstorage.fabric.api; + +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; + +import javax.annotation.Nullable; + +import net.fabricmc.fabric.api.lookup.v1.block.BlockApiLookup; +import net.minecraft.core.Direction; + +public class RefinedStorageFabricApiProxy implements RefinedStorageFabricApi { + @Nullable + private RefinedStorageFabricApi delegate; + + public void setDelegate(final RefinedStorageFabricApi delegate) { + if (this.delegate != null) { + throw new IllegalStateException("Fabric API already injected"); + } + this.delegate = delegate; + } + + private RefinedStorageFabricApi ensureLoaded() { + if (delegate == null) { + throw new IllegalStateException("Fabric API not loaded yet"); + } + return delegate; + } + + @Override + public BlockApiLookup getNetworkNodeContainerProviderLookup() { + return ensureLoaded().getNetworkNodeContainerProviderLookup(); + } +} diff --git a/refinedstorage-fabric-api/src/main/java/com/refinedmods/refinedstorage/fabric/api/RefinedStoragePlugin.java b/refinedstorage-fabric-api/src/main/java/com/refinedmods/refinedstorage/fabric/api/RefinedStoragePlugin.java new file mode 100644 index 000000000..dc609dcaa --- /dev/null +++ b/refinedstorage-fabric-api/src/main/java/com/refinedmods/refinedstorage/fabric/api/RefinedStoragePlugin.java @@ -0,0 +1,11 @@ +package com.refinedmods.refinedstorage.fabric.api; + +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.13") +@FunctionalInterface +public interface RefinedStoragePlugin { + void onApiAvailable(RefinedStorageApi api); +} diff --git a/refinedstorage-fabric-api/src/main/java/com/refinedmods/refinedstorage/fabric/api/package-info.java b/refinedstorage-fabric-api/src/main/java/com/refinedmods/refinedstorage/fabric/api/package-info.java new file mode 100644 index 000000000..b32ccb141 --- /dev/null +++ b/refinedstorage-fabric-api/src/main/java/com/refinedmods/refinedstorage/fabric/api/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.fabric.api; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-fabric/build.gradle.kts b/refinedstorage-fabric/build.gradle.kts index 0d1bf8c5a..c730faadc 100644 --- a/refinedstorage-fabric/build.gradle.kts +++ b/refinedstorage-fabric/build.gradle.kts @@ -18,6 +18,7 @@ refinedarchitect { fabric() compileWithProject(project(":refinedstorage-common")) compileWithProject(project(":refinedstorage-common-api")) + compileWithProject(project(":refinedstorage-fabric-api")) addProject(project(":refinedstorage-core-api")) addProject(project(":refinedstorage-resource-api")) addProject(project(":refinedstorage-storage-api")) diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ModInitializerImpl.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ModInitializerImpl.java index d45cd2fc4..8387e7aef 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ModInitializerImpl.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ModInitializerImpl.java @@ -3,7 +3,7 @@ import com.refinedmods.refinedstorage.common.AbstractModInitializer; import com.refinedmods.refinedstorage.common.PlatformProxy; import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; -import com.refinedmods.refinedstorage.common.api.RefinedStoragePlugin; +import com.refinedmods.refinedstorage.common.api.support.network.AbstractNetworkNodeContainerBlockEntity; import com.refinedmods.refinedstorage.common.content.BlockEntities; import com.refinedmods.refinedstorage.common.content.BlockEntityTypeFactory; import com.refinedmods.refinedstorage.common.content.Blocks; @@ -19,6 +19,8 @@ import com.refinedmods.refinedstorage.common.iface.InterfacePlatformExternalStorageProviderFactory; import com.refinedmods.refinedstorage.common.security.FallbackSecurityCardItem; import com.refinedmods.refinedstorage.common.security.SecurityCardItem; +import com.refinedmods.refinedstorage.common.storage.FluidStorageVariant; +import com.refinedmods.refinedstorage.common.storage.ItemStorageVariant; import com.refinedmods.refinedstorage.common.storage.diskdrive.AbstractDiskDriveBlockEntity; import com.refinedmods.refinedstorage.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridBlockItem; @@ -53,6 +55,9 @@ import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import com.refinedmods.refinedstorage.common.upgrade.RegulatorUpgradeItem; import com.refinedmods.refinedstorage.common.util.ServerEventQueue; +import com.refinedmods.refinedstorage.fabric.api.RefinedStorageFabricApi; +import com.refinedmods.refinedstorage.fabric.api.RefinedStorageFabricApiProxy; +import com.refinedmods.refinedstorage.fabric.api.RefinedStoragePlugin; import com.refinedmods.refinedstorage.fabric.exporter.FabricStorageExporterTransferStrategyFactory; import com.refinedmods.refinedstorage.fabric.grid.strategy.FluidGridExtractionStrategy; import com.refinedmods.refinedstorage.fabric.grid.strategy.FluidGridInsertionStrategy; @@ -134,9 +139,11 @@ public class ModInitializerImpl extends AbstractModInitializer implements ModIni @Override public void onInitialize() { AutoConfig.register(ConfigImpl.class, Toml4jConfigSerializer::new); - PlatformProxy.loadPlatform(new PlatformImpl()); initializePlatformApi(); + ((RefinedStorageFabricApiProxy) RefinedStorageFabricApi.INSTANCE).setDelegate( + new RefinedStorageFabricApiImpl() + ); registerAdditionalGridInsertionStrategyFactories(); registerGridExtractionStrategyFactories(); registerGridScrollingStrategyFactories(); @@ -148,7 +155,7 @@ public void onInitialize() { registerPacketHandlers(); registerSounds(new DirectRegistryCallback<>(BuiltInRegistries.SOUND_EVENT)); registerRecipeSerializers(new DirectRegistryCallback<>(BuiltInRegistries.RECIPE_SERIALIZER)); - registerSidedHandlers(); + registerCapabilities(); registerTickHandler(); registerWrenchingEvent(); registerSecurityBlockBreakEvent(); @@ -528,7 +535,31 @@ private static ServerPlayNetworking.PlayPayloadH return (packet, ctx) -> handler.handle(packet, ctx::player); } - private void registerSidedHandlers() { + private void registerCapabilities() { + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getCable()); + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getConstructor()); + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getController()); + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getCraftingGrid()); + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getCreativeController()); + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getDestructor()); + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getDetector()); + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getDiskDrive()); + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getDiskInterface()); + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getExporter()); + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getExternalStorage()); + Arrays.stream(FluidStorageVariant.values()).forEach(type -> + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getFluidStorageBlock(type))); + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getGrid()); + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getImporter()); + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getInterface()); + Arrays.stream(ItemStorageVariant.values()).forEach(type -> + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getItemStorageBlock(type))); + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getNetworkReceiver()); + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getNetworkTransmitter()); + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getRelay()); + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getSecurityManager()); + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getStorageMonitor()); + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getWirelessTransmitter()); registerItemStorage( AbstractDiskDriveBlockEntity.class::isInstance, AbstractDiskDriveBlockEntity.class::cast, @@ -558,6 +589,15 @@ private void registerSidedHandlers() { registerEnergyItemProviders(); } + private void registerNetworkNodeContainerProvider( + final BlockEntityType> type + ) { + RefinedStorageFabricApi.INSTANCE.getNetworkNodeContainerProviderLookup().registerForBlockEntity( + (be, dir) -> be.getContainerProvider(), + type + ); + } + private void registerItemStorage(final Predicate test, final Function caster, final Function containerSupplier, diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/PlatformImpl.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/PlatformImpl.java index c40a7e342..169862220 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/PlatformImpl.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/PlatformImpl.java @@ -12,6 +12,7 @@ import com.refinedmods.refinedstorage.common.support.resource.FluidResource; import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import com.refinedmods.refinedstorage.common.util.CustomBlockPlaceContext; +import com.refinedmods.refinedstorage.fabric.api.RefinedStorageFabricApi; import com.refinedmods.refinedstorage.fabric.grid.strategy.ItemGridInsertionStrategy; import com.refinedmods.refinedstorage.fabric.grid.view.FabricFluidGridResourceFactory; import com.refinedmods.refinedstorage.fabric.grid.view.FabricItemGridResourceFactory; @@ -436,11 +437,7 @@ public void saveSavedData(final SavedData savedData, public NetworkNodeContainerProvider getContainerProvider(final Level level, final BlockPos pos, @Nullable final Direction direction) { - final var blockEntity = level.getBlockEntity(pos); - if (blockEntity instanceof NetworkNodeContainerProvider provider) { - return provider; - } - return null; + return RefinedStorageFabricApi.INSTANCE.getNetworkNodeContainerProviderLookup().find(level, pos, direction); } @Nullable @@ -465,10 +462,16 @@ public NetworkNodeContainerProvider getContainerProviderSafely(final Level level pos, LevelChunk.EntityCreationType.CHECK ); - if (!(safeBlockEntity instanceof NetworkNodeContainerProvider provider)) { + if (safeBlockEntity == null) { return null; } - return provider; + return RefinedStorageFabricApi.INSTANCE.getNetworkNodeContainerProviderLookup().find( + level, + pos, + level.getBlockState(pos), + safeBlockEntity, + direction + ); } private void doSave(final CompoundTag compoundTag, final Path tempFile, final Path targetPath) throws IOException { diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/RefinedStorageFabricApiImpl.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/RefinedStorageFabricApiImpl.java new file mode 100644 index 000000000..e129a4bdf --- /dev/null +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/RefinedStorageFabricApiImpl.java @@ -0,0 +1,24 @@ +package com.refinedmods.refinedstorage.fabric; + +import com.refinedmods.refinedstorage.api.core.NullableType; +import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider; +import com.refinedmods.refinedstorage.fabric.api.RefinedStorageFabricApi; + +import net.fabricmc.fabric.api.lookup.v1.block.BlockApiLookup; +import net.minecraft.core.Direction; + +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; + +public class RefinedStorageFabricApiImpl implements RefinedStorageFabricApi { + private final BlockApiLookup networkNodeContainerProvider = + BlockApiLookup.get( + createIdentifier("network_node_container_provider"), + NetworkNodeContainerProvider.class, + Direction.class + ); + + @Override + public BlockApiLookup getNetworkNodeContainerProviderLookup() { + return networkNodeContainerProvider; + } +} diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/security/NetworkNodeBreakSecurityEventListener.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/security/NetworkNodeBreakSecurityEventListener.java index 2ddc31be1..fe993f2e2 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/security/NetworkNodeBreakSecurityEventListener.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/security/NetworkNodeBreakSecurityEventListener.java @@ -23,11 +23,7 @@ public boolean beforeBlockBreak(final Level world, final BlockPos pos, final BlockState state, @Nullable final BlockEntity blockEntity) { - final NetworkNodeContainerProvider provider = Platform.INSTANCE.getContainerProvider( - world, - pos, - player.getDirection().getOpposite() // TODO check - ); + final NetworkNodeContainerProvider provider = Platform.INSTANCE.getContainerProvider(world, pos, null); if (provider != null && player instanceof ServerPlayer serverPlayer && !provider.canBuild(serverPlayer)) { RefinedStorageApi.INSTANCE.sendNoPermissionMessage( serverPlayer, diff --git a/refinedstorage-fabric/src/main/resources/refinedstorage.mixins.json b/refinedstorage-fabric/src/main/resources/refinedstorage.mixins.json index 56ed7ac06..f92e1683e 100644 --- a/refinedstorage-fabric/src/main/resources/refinedstorage.mixins.json +++ b/refinedstorage-fabric/src/main/resources/refinedstorage.mixins.json @@ -1,14 +1,14 @@ { "required": true, "minVersion": "0.8", - "package": "com.refinedmods.refinedstorage.platform.fabric.mixin", + "package": "com.refinedmods.refinedstorage.fabric.mixin", "compatibilityLevel": "JAVA_17", "client": [ - "com.refinedmods.refinedstorage.fabric.mixin.AbstractModelBakerImplMixin", - "com.refinedmods.refinedstorage.fabric.mixin.EditBoxAccessor", - "com.refinedmods.refinedstorage.fabric.mixin.ItemPropertiesAccessor", - "com.refinedmods.refinedstorage.fabric.mixin.KeyMappingAccessor", - "com.refinedmods.refinedstorage.fabric.mixin.ModelBakeryAccessor" + "AbstractModelBakerImplMixin", + "EditBoxAccessor", + "ItemPropertiesAccessor", + "KeyMappingAccessor", + "ModelBakeryAccessor" ], "injectors": { "defaultRequire": 1 diff --git a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/GridOperationsImplTest.java b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/GridOperationsImplTest.java index 4f34d02ce..d6d78513c 100644 --- a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/GridOperationsImplTest.java +++ b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/GridOperationsImplTest.java @@ -9,9 +9,9 @@ import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.EmptyActor; import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; import com.refinedmods.refinedstorage.api.storage.root.RootStorage; import com.refinedmods.refinedstorage.api.storage.root.RootStorageImpl; -import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageImpl; diff --git a/refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/RefinedStorageNeoForgeApi.java b/refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/RefinedStorageNeoForgeApi.java index ba2137596..ac8fe960a 100644 --- a/refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/RefinedStorageNeoForgeApi.java +++ b/refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/RefinedStorageNeoForgeApi.java @@ -7,9 +7,9 @@ import net.neoforged.neoforge.capabilities.BlockCapability; import org.apiguardian.api.API; -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.13") +@API(status = API.Status.STABLE, since = "2.0.0-milestone.4.5") public interface RefinedStorageNeoForgeApi { - RefinedStorageNeoForgeApi INSTANCE = new ProxyRefinedStorageNeoForgeApi(); + RefinedStorageNeoForgeApi INSTANCE = new RefinedStorageNeoForgeApiProxy(); BlockCapability getNetworkNodeContainerProviderCapability(); } diff --git a/refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/ProxyRefinedStorageNeoForgeApi.java b/refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/RefinedStorageNeoForgeApiProxy.java similarity index 94% rename from refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/ProxyRefinedStorageNeoForgeApi.java rename to refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/RefinedStorageNeoForgeApiProxy.java index 1f68323c9..7512269cd 100644 --- a/refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/ProxyRefinedStorageNeoForgeApi.java +++ b/refinedstorage-neoforge-api/src/main/java/com/refinedmods/refinedstorage/neoforge/api/RefinedStorageNeoForgeApiProxy.java @@ -7,7 +7,7 @@ import net.minecraft.core.Direction; import net.neoforged.neoforge.capabilities.BlockCapability; -public class ProxyRefinedStorageNeoForgeApi implements RefinedStorageNeoForgeApi { +public class RefinedStorageNeoForgeApiProxy implements RefinedStorageNeoForgeApi { @Nullable private RefinedStorageNeoForgeApi delegate; diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ModInitializer.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ModInitializer.java index 2dd549f64..a338ab84a 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ModInitializer.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ModInitializer.java @@ -54,8 +54,8 @@ import com.refinedmods.refinedstorage.common.upgrade.RegulatorUpgradeItem; import com.refinedmods.refinedstorage.common.util.IdentifierUtil; import com.refinedmods.refinedstorage.common.util.ServerEventQueue; -import com.refinedmods.refinedstorage.neoforge.api.ProxyRefinedStorageNeoForgeApi; import com.refinedmods.refinedstorage.neoforge.api.RefinedStorageNeoForgeApi; +import com.refinedmods.refinedstorage.neoforge.api.RefinedStorageNeoForgeApiProxy; import com.refinedmods.refinedstorage.neoforge.exporter.FluidHandlerExporterTransferStrategyFactory; import com.refinedmods.refinedstorage.neoforge.exporter.ItemHandlerExporterTransferStrategyFactory; import com.refinedmods.refinedstorage.neoforge.grid.strategy.FluidGridExtractionStrategy; @@ -86,6 +86,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.flag.FeatureFlags; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.MenuType; @@ -153,7 +154,7 @@ public class ModInitializer extends AbstractModInitializer { public ModInitializer(final IEventBus eventBus, final ModContainer modContainer) { PlatformProxy.loadPlatform(new PlatformImpl(modContainer)); initializePlatformApi(); - ((ProxyRefinedStorageNeoForgeApi) RefinedStorageNeoForgeApi.INSTANCE).setDelegate( + ((RefinedStorageNeoForgeApiProxy) RefinedStorageNeoForgeApi.INSTANCE).setDelegate( new RefinedStorageNeoForgeApiImpl() ); registerAdditionalGridInsertionStrategyFactories(); @@ -526,14 +527,14 @@ public void registerWrenchingEvent(final PlayerInteractEvent.RightClickBlock e) @SubscribeEvent public void registerSecurityBlockBreakEvent(final BlockEvent.BreakEvent e) { - final NetworkNodeContainerProvider provider = Platform.INSTANCE.getContainerProvider( - (Level) e.getLevel(), // TODO: change. - e.getPos(), - e.getPlayer().getDirection().getOpposite() // TODO check - ); - if (provider != null && e.getPlayer() instanceof ServerPlayer srvrPlayer && !provider.canBuild(srvrPlayer)) { + if (!(e.getLevel() instanceof Level level)) { + return; + } + final NetworkNodeContainerProvider provider = Platform.INSTANCE.getContainerProvider(level, e.getPos(), null); + final Player player = e.getPlayer(); + if (provider != null && player instanceof ServerPlayer serverPlayer && !provider.canBuild(serverPlayer)) { RefinedStorageApi.INSTANCE.sendNoPermissionMessage( - srvrPlayer, + serverPlayer, createTranslation("misc", "no_permission.build.break", e.getState().getBlock().getName()) ); e.setCanceled(true); diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/PlatformImpl.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/PlatformImpl.java index fdedb8562..acf8618a4 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/PlatformImpl.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/PlatformImpl.java @@ -12,6 +12,7 @@ import com.refinedmods.refinedstorage.common.support.resource.FluidResource; import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import com.refinedmods.refinedstorage.common.util.CustomBlockPlaceContext; +import com.refinedmods.refinedstorage.neoforge.api.RefinedStorageNeoForgeApi; import com.refinedmods.refinedstorage.neoforge.grid.strategy.ItemGridInsertionStrategy; import com.refinedmods.refinedstorage.neoforge.grid.view.ForgeFluidGridResourceFactory; import com.refinedmods.refinedstorage.neoforge.grid.view.ForgeItemGridResourceFactory; @@ -358,7 +359,7 @@ public NetworkNodeContainerProvider getContainerProvider(final Level level, final BlockPos pos, @Nullable final Direction direction) { return level.getCapability( - RefinedStorageNeoForgeApiImpl.INSTANCE.getNetworkNodeContainerProviderCapability(), + RefinedStorageNeoForgeApi.INSTANCE.getNetworkNodeContainerProviderCapability(), pos, direction ); @@ -390,7 +391,7 @@ public NetworkNodeContainerProvider getContainerProviderSafely(final Level level return null; } return level.getCapability( - RefinedStorageNeoForgeApiImpl.INSTANCE.getNetworkNodeContainerProviderCapability(), + RefinedStorageNeoForgeApi.INSTANCE.getNetworkNodeContainerProviderCapability(), pos, null, safeBlockEntity, diff --git a/settings.gradle.kts b/settings.gradle.kts index 92682b741..fb2b9aa5f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -53,6 +53,7 @@ include("refinedstorage-network") include("refinedstorage-common-api") include("refinedstorage-common") include("refinedstorage-fabric") +include("refinedstorage-fabric-api") include("refinedstorage-neoforge") include("refinedstorage-neoforge-api") include("refinedstorage-network-test") From 5f59e3d6eda6cedf54a74877bfe9bd50a707d189 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 25 Jul 2024 23:02:14 +0200 Subject: [PATCH 35/36] fix: silicon tag missing and recipes not using silicon tag --- CHANGELOG.md | 1 + .../src/main/resources/data/c/tags/item/silicon.json | 6 ++++++ .../data/refinedstorage/recipe/1k_storage_part.json | 2 +- .../data/refinedstorage/recipe/64b_fluid_storage_part.json | 2 +- .../resources/data/refinedstorage/recipe/controller.json | 2 +- .../data/refinedstorage/recipe/raw_advanced_processor.json | 2 +- .../data/refinedstorage/recipe/raw_basic_processor.json | 2 +- .../data/refinedstorage/recipe/raw_improved_processor.json | 2 +- 8 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 refinedstorage-common/src/main/resources/data/c/tags/item/silicon.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 6398cd1ef..37b9e7543 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - Fixed crash when trying to export fluids into an Interface on Fabric. - Fixed Relay configuration not being correct on NeoForge. - Fixed crash in logs when trying to quick craft an empty result slot in the Crafting Grid. +- Fixed recipes not using silicon tag and Refined Storage silicon not being tagged properly. ## [2.0.0-milestone.4.4] - 2024-07-10 diff --git a/refinedstorage-common/src/main/resources/data/c/tags/item/silicon.json b/refinedstorage-common/src/main/resources/data/c/tags/item/silicon.json new file mode 100644 index 000000000..bb6bc4f43 --- /dev/null +++ b/refinedstorage-common/src/main/resources/data/c/tags/item/silicon.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "refinedstorage:silicon" + ] +} diff --git a/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/1k_storage_part.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/1k_storage_part.json index ed749ef7a..4fb7cb9d4 100644 --- a/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/1k_storage_part.json +++ b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/1k_storage_part.json @@ -7,7 +7,7 @@ ], "key": { "S": { - "item": "refinedstorage:silicon" + "tag": "c:silicon" }, "E": { "item": "refinedstorage:quartz_enriched_iron" diff --git a/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_part.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_part.json index 36ff7f29c..1d4848803 100644 --- a/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_part.json +++ b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_part.json @@ -7,7 +7,7 @@ ], "key": { "S": { - "item": "refinedstorage:silicon" + "tag": "c:silicon" }, "E": { "item": "refinedstorage:quartz_enriched_iron" diff --git a/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/controller.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/controller.json index 70ef12fd8..3f46658ff 100644 --- a/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/controller.json +++ b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/controller.json @@ -13,7 +13,7 @@ "item": "refinedstorage:advanced_processor" }, "S": { - "item": "refinedstorage:silicon" + "tag": "c:silicon" }, "M": { "item": "refinedstorage:machine_casing" diff --git a/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/raw_advanced_processor.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/raw_advanced_processor.json index b7e4bb07e..9880d2935 100644 --- a/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/raw_advanced_processor.json +++ b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/raw_advanced_processor.json @@ -8,7 +8,7 @@ "tag": "c:gems/diamond" }, { - "item": "refinedstorage:silicon" + "tag": "c:silicon" }, { "tag": "c:dusts/redstone" diff --git a/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/raw_basic_processor.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/raw_basic_processor.json index 813373564..86ccd4346 100644 --- a/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/raw_basic_processor.json +++ b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/raw_basic_processor.json @@ -8,7 +8,7 @@ "tag": "c:ingots/iron" }, { - "item": "refinedstorage:silicon" + "tag": "c:silicon" }, { "tag": "c:dusts/redstone" diff --git a/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/raw_improved_processor.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/raw_improved_processor.json index 7e59524f6..c50897d1d 100644 --- a/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/raw_improved_processor.json +++ b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/raw_improved_processor.json @@ -8,7 +8,7 @@ "tag": "c:ingots/gold" }, { - "item": "refinedstorage:silicon" + "tag": "c:silicon" }, { "tag": "c:dusts/redstone" From d356f2972c8b04216df93f6d53013d61f0ea0932 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 26 Jul 2024 07:08:50 +0000 Subject: [PATCH 36/36] chore: prepare release v2.0.0-milestone.4.5 --- CHANGELOG.md | 666 ++++++++++++++++++++++++++------------------------- 1 file changed, 335 insertions(+), 331 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37b9e7543..367afbe1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,17 +7,19 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [2.0.0-milestone.4.5] - 2024-07-26 + ### Added -- Ability to extract fluids from the Interface using an empty bucket or other empty fluid container. -- Support for the NeoForge config screen. +- Ability to extract fluids from the Interface using an empty bucket or other empty fluid container. +- Support for the NeoForge config screen. ### Fixed -- Fixed crash when trying to export fluids into an Interface on Fabric. -- Fixed Relay configuration not being correct on NeoForge. -- Fixed crash in logs when trying to quick craft an empty result slot in the Crafting Grid. -- Fixed recipes not using silicon tag and Refined Storage silicon not being tagged properly. +- Fixed crash when trying to export fluids into an Interface on Fabric. +- Fixed Relay configuration not being correct on NeoForge. +- Fixed crash in logs when trying to quick craft an empty result slot in the Crafting Grid. +- Fixed recipes not using silicon tag and Refined Storage silicon not being tagged properly. ## [2.0.0-milestone.4.4] - 2024-07-10 @@ -25,17 +27,17 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Added -- Ability to open Portable Grid with a keybinding. +- Ability to open Portable Grid with a keybinding. ### Fixed -- Fixed Relay model not being able to load correctly. -- Fixed not being able to ghost drag resources from recipe viewers into filter slots on NeoForge. -- Fixed extra dark backgrounds due to drawing background on GUIs twice. -- Fixed Configuration Card not being able to transfer upgrades for the Wireless Transmitter. -- Fixed upgrade inventories not maintaining order after reloading. Upgrade inventories from the milestone 4.2 are - incompatible and will be empty. -- Fixed Wireless Transmitter not dropping upgrades when breaking block. +- Fixed Relay model not being able to load correctly. +- Fixed not being able to ghost drag resources from recipe viewers into filter slots on NeoForge. +- Fixed extra dark backgrounds due to drawing background on GUIs twice. +- Fixed Configuration Card not being able to transfer upgrades for the Wireless Transmitter. +- Fixed upgrade inventories not maintaining order after reloading. Upgrade inventories from the milestone 4.2 are + incompatible and will be empty. +- Fixed Wireless Transmitter not dropping upgrades when breaking block. ## [2.0.0-milestone.4.2] - 2024-07-06 @@ -43,41 +45,41 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Fixed -- Fixed creative mode tab icon on NeoForge showing a durability bar. +- Fixed creative mode tab icon on NeoForge showing a durability bar. ## [2.0.0-milestone.4.0] - 2024-07-04 ### Added -- Ported to Minecraft 1.21. -- More help information for items. -- Quartz Enriched Copper, used to craft cables. -- Block of Quartz Enriched Copper +- Ported to Minecraft 1.21. +- More help information for items. +- Quartz Enriched Copper, used to craft cables. +- Block of Quartz Enriched Copper ### Changed -- The mod ID has been changed from "refinedstorage2" to "refinedstorage". Worlds that used milestone 3 on Minecraft - 1.20.4 are no longer compatible. -- Recipes now use common tag conventions from NeoForge and Fabric. +- The mod ID has been changed from "refinedstorage2" to "refinedstorage". Worlds that used milestone 3 on Minecraft + 1.20.4 are no longer compatible. +- Recipes now use common tag conventions from NeoForge and Fabric. ### Fixed -- Regulator Upgrade having wrong GUI title. -- Crafting Grid not dropping crafting matrix contents when broken. -- "+1" button on amount screen not doing anything. +- Regulator Upgrade having wrong GUI title. +- Crafting Grid not dropping crafting matrix contents when broken. +- "+1" button on amount screen not doing anything. ## [2.0.0-milestone.3.14] - 2024-06-28 ### Added -- Disk Interface (formerly known as the "Disk Manipulator"). -- Item tag translations. +- Disk Interface (formerly known as the "Disk Manipulator"). +- Item tag translations. ### Fixed -- Relay having no help tooltip. -- Fixed bug where adding more Speed Upgrades would actually slow down the device even more. -- Fixed missing textures for scheduling mode side button. +- Relay having no help tooltip. +- Fixed bug where adding more Speed Upgrades would actually slow down the device even more. +- Fixed missing textures for scheduling mode side button. ## [2.0.0-milestone.3.13] - 2024-06-16 @@ -85,13 +87,13 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Removed -- The Trinkets integration has been removed and will be moved to an addon mod. +- The Trinkets integration has been removed and will be moved to an addon mod. ## [2.0.0-milestone.3.11] - 2024-06-16 ### Removed -- The Curios integration has been removed and will be moved to an addon mod. +- The Curios integration has been removed and will be moved to an addon mod. ## [2.0.0-milestone.3.10] - 2024-06-16 @@ -99,597 +101,599 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Fixed -- Side button tooltip rendering issue with ModernUI. +- Side button tooltip rendering issue with ModernUI. ## [2.0.0-milestone.3.8] - 2024-06-08 ### Removed -- The REI integration has been removed and will be moved to an addon mod. +- The REI integration has been removed and will be moved to an addon mod. ## [2.0.0-milestone.3.7] - 2024-06-03 ### Removed -- The JEI integration has been removed and will be moved to an addon mod. +- The JEI integration has been removed and will be moved to an addon mod. ## [2.0.0-milestone.3.6] - 2024-05-18 ### Added -- Relay +- Relay ### Changed -- The Detector, Network Receiver, Network Transmitter and Security Manager will now always connect regardless of color. -- The Relay now has a "pass-through" mode. By default, pass-through is on, which means that when the Relay is active, - the network signal from the input network will be passed through as-is to the output side. -- When the "pass-through" mode on the Relay is off, the network signal from the input network will no longer be passed - through as-is to the output side, but you can choose to pass the energy buffer, security settings or (specific) - storage resources of the input network to the output network. -- When using the Relay when "pass-through" mode is off, and when passing all storage resources or specific storage - resources, you can choose the filter mode, whether fuzzy mode is enabled, the access mode and the priority of the - storage exposed to the output network. +- The Detector, Network Receiver, Network Transmitter and Security Manager will now always connect regardless of color. +- The Relay now has a "pass-through" mode. By default, pass-through is on, which means that when the Relay is active, + the network signal from the input network will be passed through as-is to the output side. +- When the "pass-through" mode on the Relay is off, the network signal from the input network will no longer be passed + through as-is to the output side, but you can choose to pass the energy buffer, security settings or (specific) + storage resources of the input network to the output network. +- When using the Relay when "pass-through" mode is off, and when passing all storage resources or specific storage + resources, you can choose the filter mode, whether fuzzy mode is enabled, the access mode and the priority of the + storage exposed to the output network. ### Fixed -- Double slot highlighting in the Grid. -- Improved data corruption protection for storages. +- Double slot highlighting in the Grid. +- Improved data corruption protection for storages. ## [2.0.0-milestone.3.5] - 2024-04-04 ### Added -- Security Card -- Fallback Security Card -- Security Manager +- Security Card +- Fallback Security Card +- Security Manager ### Changed -- The permissions for a Security Card must be configured through the card itself, instead of via the Security Manager. -- The Security Card can be bound to other (currently online) players via its GUI. -- The binding of a Security Card can now be cleared. -- The Security Card tooltip and GUI now show whether the permission has been touched/changed in any way. -- As soon as a Security Manager is placed, the storage network will be locked down by default. Start adding Security - Cards to allow or deny specific access to players. -- To not lock the entire network by default for players who do not have a matching Security Card, a Fallback Security - Card can be used to configure this behavior. -- Smooth scrolling, screen size and max row stretch are no longer Grid-specific settings, but are now global settings. +- The permissions for a Security Card must be configured through the card itself, instead of via the Security Manager. +- The Security Card can be bound to other (currently online) players via its GUI. +- The binding of a Security Card can now be cleared. +- The Security Card tooltip and GUI now show whether the permission has been touched/changed in any way. +- As soon as a Security Manager is placed, the storage network will be locked down by default. Start adding Security + Cards to allow or deny specific access to players. +- To not lock the entire network by default for players who do not have a matching Security Card, a Fallback Security + Card can be used to configure this behavior. +- Smooth scrolling, screen size and max row stretch are no longer Grid-specific settings, but are now global settings. ### Fixed -- Wireless Grid name not being correct in the GUI. +- Wireless Grid name not being correct in the GUI. ## [2.0.0-milestone.3.4] - 2024-03-16 ### Added -- Void excess mode to storages. +- Void excess mode to storages. ### Fixed -- Fixed losing disk when using Wrench dismantling on the Portable Grid. -- Fixed losing energy when using Wrench dismantling on the Portable Grid and the Controller. -- Fixed changing side buttons not working on Forge. -- Fixed External Storage not displaying empty allowlist warning. -- Fixed incrementing starting from 1 in amount screens not having an intended off-by-one. -- Fixed problems moving network devices with "Carry On" mod. -- Fixed escape key not working on auto-selected Grid search box. +- Fixed losing disk when using Wrench dismantling on the Portable Grid. +- Fixed losing energy when using Wrench dismantling on the Portable Grid and the Controller. +- Fixed changing side buttons not working on Forge. +- Fixed External Storage not displaying empty allowlist warning. +- Fixed incrementing starting from 1 in amount screens not having an intended off-by-one. +- Fixed problems moving network devices with "Carry On" mod. +- Fixed escape key not working on auto-selected Grid search box. ## [2.0.0-milestone.3.3] - 2024-02-17 ### Added -- Ported to Minecraft 1.20.4. -- Custom disk models. Fluid disks now have a different model. -- Portable Grid -- Chinese translation by [@Jiangsubei](https://github.com/Jiangsubei). +- Ported to Minecraft 1.20.4. +- Custom disk models. Fluid disks now have a different model. +- Portable Grid +- Chinese translation by [@Jiangsubei](https://github.com/Jiangsubei). ### Changed -- The Portable Grid now shows an energy bar in the UI. -- The energy bar on creative items now shows the infinity symbol instead of the whole amount. +- The Portable Grid now shows an energy bar in the UI. +- The energy bar on creative items now shows the infinity symbol instead of the whole amount. ### Fixed -- Fixed bug where Grid contents weren't synced properly when a network merge occurs. -- Fixed incompatibility crash with InvMove on Fabric. +- Fixed bug where Grid contents weren't synced properly when a network merge occurs. +- Fixed incompatibility crash with InvMove on Fabric. ## [2.0.0-milestone.3.2] - 2023-11-03 ### Added -- Configuration Card. It copies device configurations and can transfer upgrades. -- Network Receiver -- Network Card -- Network Transmitter +- Configuration Card. It copies device configurations and can transfer upgrades. +- Network Receiver +- Network Card +- Network Transmitter ### Changed -- The Network Transmitter now goes into an "errored" state if there is no connection (anymore) with the Network - Receiver (due to chunk unloading for example). -- The Network Transmitter will actively try to reconnect with the Network Receiver if connection is lost. +- The Network Transmitter now goes into an "errored" state if there is no connection (anymore) with the Network + Receiver (due to chunk unloading for example). +- The Network Transmitter will actively try to reconnect with the Network Receiver if connection is lost. ### Fixed -- Inactive Wireless Transmitter model being emissive. -- Unneeded network graph updating after placing a network device. -- Cable blocks not updating connections properly when using wrench. +- Inactive Wireless Transmitter model being emissive. +- Unneeded network graph updating after placing a network device. +- Cable blocks not updating connections properly when using wrench. ## [2.0.0-milestone.3.1] - 2023-10-30 ### Added -- "Open Wireless Grid" keybinding. -- Curios integration on Forge. -- Trinkets integration on Fabric. -- Storage Monitor +- "Open Wireless Grid" keybinding. +- Curios integration on Forge. +- Trinkets integration on Fabric. +- Storage Monitor ### Changed -- You can now recharge the Controller in item form. +- You can now recharge the Controller in item form. ### Fixed -- Fixed a random Grid crash. +- Fixed a random Grid crash. ### Removed -- The `useEnergy` config option for the Wireless Grid. If you do not wish to use energy, use the - Creative Wireless Grid. +- The `useEnergy` config option for the Wireless Grid. If you do not wish to use energy, use the + Creative Wireless Grid. ## [2.0.0-milestone.3.0] - 2023-08-27 ### Added -- Wireless Grid -- Creative Wireless Grid -- Wireless Transmitter -- Range Upgrade -- Creative Range Upgrade -- Fully charged Controller variants to the creative mode tab. +- Wireless Grid +- Creative Wireless Grid +- Wireless Transmitter +- Range Upgrade +- Creative Range Upgrade +- Fully charged Controller variants to the creative mode tab. ### Changed -- The Forge variant now targets NeoForge instead of Forge. -- You can now always open the Wireless Grid, even if there is no network bound or if the Wireless Grid is out of - energy. +- The Forge variant now targets NeoForge instead of Forge. +- You can now always open the Wireless Grid, even if there is no network bound or if the Wireless Grid is out of + energy. ### Fixed -- Fixed inactive Grid slots still rendering resources. -- Fixed being able to interact with inactive Grid. -- Fixed nearly on/off Controller model not being rendered correctly on Forge. -- Fixed Controller energy tooltip not working. +- Fixed inactive Grid slots still rendering resources. +- Fixed being able to interact with inactive Grid. +- Fixed nearly on/off Controller model not being rendered correctly on Forge. +- Fixed Controller energy tooltip not working. ## [2.0.0-milestone.2.14] - 2023-08-19 ### Added -- Support for JEI/REI exclusion zones. -- Support for JEI/REI ghost ingredient dragging. +- Support for JEI/REI exclusion zones. +- Support for JEI/REI ghost ingredient dragging. ## [2.0.0-milestone.2.13] - 2023-08-18 ### Changed -- The Interface now supports fluids. +- The Interface now supports fluids. ### Fixed -- Fixed filter slot hints not being aware of the resource types that they can show in a slot. -- Fixed Exporter only exporting 1 mB per cycle on Forge. -- Fixed not being able to use any blocks on Fabric or Forge. -- Fixed External Storage crash on Fabric when a stack with zero amount is exposed. +- Fixed filter slot hints not being aware of the resource types that they can show in a slot. +- Fixed Exporter only exporting 1 mB per cycle on Forge. +- Fixed not being able to use any blocks on Fabric or Forge. +- Fixed External Storage crash on Fabric when a stack with zero amount is exposed. ## [2.0.0-milestone.2.12] - 2023-08-06 ### Added -- Constructor -- Regulator Upgrade -- Filter slot hints that show which resource will be put in a filter slot and what the effect of the filter is on the - device. -- Grid slot hints that show which resource will be inserted or extracted in a Grid. -- Help information to the side buttons by pressing SHIFT. -- Help information on items. -- A warning to the "filter mode" button on the storage screens if there is an allowlist with no configured filters. -- The "supported by" tooltip on upgrade items now shows the devices that accept the upgrade. +- Constructor +- Regulator Upgrade +- Filter slot hints that show which resource will be put in a filter slot and what the effect of the filter is on the + device. +- Grid slot hints that show which resource will be inserted or extracted in a Grid. +- Help information to the side buttons by pressing SHIFT. +- Help information on items. +- A warning to the "filter mode" button on the storage screens if there is an allowlist with no configured filters. +- The "supported by" tooltip on upgrade items now shows the devices that accept the upgrade. ### Changed -- The Constructor crafting recipe now takes 2 diamonds instead of 2 redstone. -- You can now select a "Scheduling mode" in the Constructor: first available, round robin, random. -- The "applicable upgrades" tooltip on the upgrade slot tooltip now shows the upgrade items in item form. -- The Regulator Upgrade now works in an Importer as well. It will only keep importing until the configured amount is - reached. -- The Regulator Upgrade now needs to be configured separately, by using the upgrade. It can no longer be configured in - the device GUI itself. +- The Constructor crafting recipe now takes 2 diamonds instead of 2 redstone. +- You can now select a "Scheduling mode" in the Constructor: first available, round robin, random. +- The "applicable upgrades" tooltip on the upgrade slot tooltip now shows the upgrade items in item form. +- The Regulator Upgrade now works in an Importer as well. It will only keep importing until the configured amount is + reached. +- The Regulator Upgrade now needs to be configured separately, by using the upgrade. It can no longer be configured in + the device GUI itself. ### Fixed -- Fixed Grid voiding fluids if there was no space in inventory on Fabric. -- Fixed Grid dropping fluid buckets if there was no space in inventory on Forge. -- Fixed compatibility with custom tooltips in the Grid. -- Fixed bundle tooltip in the Grid. -- Fixed changes to access mode or fuzzy mode not being persisted. -- Fixed being able to put any item in the upgrade slots. +- Fixed Grid voiding fluids if there was no space in inventory on Fabric. +- Fixed Grid dropping fluid buckets if there was no space in inventory on Forge. +- Fixed compatibility with custom tooltips in the Grid. +- Fixed bundle tooltip in the Grid. +- Fixed changes to access mode or fuzzy mode not being persisted. +- Fixed being able to put any item in the upgrade slots. ## [2.0.0-milestone.2.11] - 2023-07-04 ### Added -- Ported to Minecraft 1.20.1. +- Ported to Minecraft 1.20.1. ### Fixed -- Fixed not firing block break event on Fabric for the Destructor. +- Fixed not firing block break event on Fabric for the Destructor. ## [2.0.0-milestone.2.10] - 2023-05-29 ### Added -- Ported to Minecraft 1.19.4 -- Destructor -- Fortune Upgrade (I, II and III) -- Silk Touch Upgrade +- Ported to Minecraft 1.19.4 +- Destructor +- Fortune Upgrade (I, II and III) +- Silk Touch Upgrade ### Changed -- The Detector screen now is a proper amount screen by having increment/decrement buttons and scrollbar support. -- The amount in an amount screen is now colored red if the amount is invalid. -- The Destructor crafting recipe now takes 2 diamonds instead of 2 redstone. +- The Detector screen now is a proper amount screen by having increment/decrement buttons and scrollbar support. +- The amount in an amount screen is now colored red if the amount is invalid. +- The Destructor crafting recipe now takes 2 diamonds instead of 2 redstone. ### Fixed -- Fixed missing Speed Upgrade energy usage config on Forge. -- Fixed Grid screen not handling network changes properly. -- Fixed Grid scrollbar scrolling when using SHIFT or CTRL. -- Fixed wrong Controller tooltip. +- Fixed missing Speed Upgrade energy usage config on Forge. +- Fixed Grid screen not handling network changes properly. +- Fixed Grid scrollbar scrolling when using SHIFT or CTRL. +- Fixed wrong Controller tooltip. ### Removed -- Removed "Fuzzy mode" from the Destructor as the filter in the Destructor compares with the block anyway. +- Removed "Fuzzy mode" from the Destructor as the filter in the Destructor compares with the block anyway. ## [2.0.0-milestone.2.9] - 2023-03-31 ### Fixed -- Fixed not being able to update filter slots on servers. +- Fixed not being able to update filter slots on servers. ### Added -- Detector +- Detector ### Changed -- Detectors can now be placed sideways or upside down. -- Detectors no longer detect all resources when unconfigured. -- Redstone updates by Detectors are now rate-limited to once per second. -- For fluids, the Detector now always accepts the amount in buckets. +- Detectors can now be placed sideways or upside down. +- Detectors no longer detect all resources when unconfigured. +- Redstone updates by Detectors are now rate-limited to once per second. +- For fluids, the Detector now always accepts the amount in buckets. ## [2.0.0-milestone.2.8] - 2023-03-04 ### Fixed -- Fixed Disk Drive having 9 slots instead of 8. -- Fixed slow world loading. +- Fixed Disk Drive having 9 slots instead of 8. +- Fixed slow world loading. ### Added -- The upgrade slots now show their supported upgrades. -- Different Cable colors. They only connect to same colored cables or the default cable. -- Colored variant of exporters, importers and external storages. They connect the same way as colored cables. -- Support for using the R/U keys in JEI and REI on Grid slots and filtering slots -- Crafting Grid. -- JEI and REI recipe transfer integration for the Crafting Grid. -- The crafting matrix in the Crafting Grid now has a button and keybinding to clear to the player inventory. - The keybinding is only available on Forge. -- A config option to clear items from the Crafting Grid crafting matrix to the player or network inventory. -- Support for collapsable entries for REI. -- Pressing CTRL + SHIFT on the crafting result slot filters the Grid view based on the items in the crafting matrix. - The reason for this is that you can quickly see how much you have left in the storage network. +- The upgrade slots now show their supported upgrades. +- Different Cable colors. They only connect to same colored cables or the default cable. +- Colored variant of exporters, importers and external storages. They connect the same way as colored cables. +- Support for using the R/U keys in JEI and REI on Grid slots and filtering slots +- Crafting Grid. +- JEI and REI recipe transfer integration for the Crafting Grid. +- The crafting matrix in the Crafting Grid now has a button and keybinding to clear to the player inventory. + The keybinding is only available on Forge. +- A config option to clear items from the Crafting Grid crafting matrix to the player or network inventory. +- Support for collapsable entries for REI. +- Pressing CTRL + SHIFT on the crafting result slot filters the Grid view based on the items in the crafting matrix. + The reason for this is that you can quickly see how much you have left in the storage network. ### Changed -- The button to clear to the network inventory next to the crafting matrix in the Crafting Grid is now disabled if - the Crafting Grid is inactive. -- The keybinding to clear the Crafting Grid matrix to the network inventory is only available on Forge. -- The JEI recipe transfer integration for the Crafting Grid now only supports regular crafting recipes. -- Decreased amount of logging to the info level. Now most logging happens on the debug level. +- The button to clear to the network inventory next to the crafting matrix in the Crafting Grid is now disabled if + the Crafting Grid is inactive. +- The keybinding to clear the Crafting Grid matrix to the network inventory is only available on Forge. +- The JEI recipe transfer integration for the Crafting Grid now only supports regular crafting recipes. +- Decreased amount of logging to the info level. Now most logging happens on the debug level. ### Removed -- Removed amount of stacks and max stacks stored on item storage tooltips. +- Removed amount of stacks and max stacks stored on item storage tooltips. ## [2.0.0-milestone.2.7] - 2023-01-31 ### Added -- Added a "Storage channel" filter in the Grid that determines which resource type is shown. Defaults to "All". +- Added a "Storage channel" filter in the Grid that determines which resource type is shown. Defaults to "All". ### Changed -- Ported to Minecraft 1.19.3. -- The regular Grid now shows fluids as well. -- You can insert fluids in the Grid by right-clicking a fluid container in the Grid slots. -- You no longer have to explicitly select a resource type for the filter configuration slots. You can set a fluid - by right-clicking a fluid container in the filter slots. -- You can no longer insert fluids into the Grid or filter slots straight from the player inventory slots, you have to - insert the fluid while holding the fluid container. +- Ported to Minecraft 1.19.3. +- The regular Grid now shows fluids as well. +- You can insert fluids in the Grid by right-clicking a fluid container in the Grid slots. +- You no longer have to explicitly select a resource type for the filter configuration slots. You can set a fluid + by right-clicking a fluid container in the filter slots. +- You can no longer insert fluids into the Grid or filter slots straight from the player inventory slots, you have to + insert the fluid while holding the fluid container. ### Removed -- Removed the Fluid Grid, which has been combined into the regular Grid. +- Removed the Fluid Grid, which has been combined into the regular Grid. ## [2.0.0-milestone.2.6] - 2023-01-13 ### Fixed -- Fixed missing recoloring recipes for Grid and Controller to default color. -- Fixed missing recoloring recipes for Fluid Grid. +- Fixed missing recoloring recipes for Grid and Controller to default color. +- Fixed missing recoloring recipes for Fluid Grid. ## [2.0.0-milestone.2.5] - 2023-01-11 ### Fixed -- Fixed IO loops caused by Interfaces stealing from each other. -- Fixed storages from an External Storage not reporting when a resource has last changed. +- Fixed IO loops caused by Interfaces stealing from each other. +- Fixed storages from an External Storage not reporting when a resource has last changed. ### Changed -- An Interface that is acting as External Storage can no longer extract or insert from other Interfaces (and itself) - that are acting as External Storage. +- An Interface that is acting as External Storage can no longer extract or insert from other Interfaces (and itself) + that are acting as External Storage. ## [2.0.0-milestone.2.4] - 2022-11-01 ### Fixed -- Fixed missing AutoConfig config option translations on Fabric. -- Fixed Grid resource failing to insert if another resource with the same name but different NBT data already exists. -- Fixed Importer not dropping upgrades when broken. -- Fixed Disk Drive inventory not being available as external inventory on Forge. +- Fixed missing AutoConfig config option translations on Fabric. +- Fixed Grid resource failing to insert if another resource with the same name but different NBT data already exists. +- Fixed Importer not dropping upgrades when broken. +- Fixed Disk Drive inventory not being available as external inventory on Forge. ### Added -- Exporter -- Interface -- External Storage +- Exporter +- Interface +- External Storage ### Changed -- You can now select a "Scheduling mode" in the Exporter: first available, round robin, random. -- The Interface no longer has dedicated import slots. The imported items now go into the export slots. -- The Interface now imports items immediately. -- "Exact mode" has been replaced with "Fuzzy mode", which is off by default for performance. -- The External Storage no longer shows the amount of resources stored on the GUI. -- The External Storage now supports multiple resource types at the same time. -- The External Storage no longer checks for external changes every tick, but rather has a cooldown system. +- You can now select a "Scheduling mode" in the Exporter: first available, round robin, random. +- The Interface no longer has dedicated import slots. The imported items now go into the export slots. +- The Interface now imports items immediately. +- "Exact mode" has been replaced with "Fuzzy mode", which is off by default for performance. +- The External Storage no longer shows the amount of resources stored on the GUI. +- The External Storage now supports multiple resource types at the same time. +- The External Storage no longer checks for external changes every tick, but rather has a cooldown system. ## [2.0.0-milestone.2.3] - 2022-08-26 ### Changed -- Ported to Minecraft 1.19.2. +- Ported to Minecraft 1.19.2. ### Fixed -- Fixed mixin crash on startup on Fabric. +- Fixed mixin crash on startup on Fabric. ### Added -- NoIndium mod is now packaged with the mod on Fabric to avoid launching Sodium without Indium. +- NoIndium mod is now packaged with the mod on Fabric to avoid launching Sodium without Indium. ## [2.0.0-milestone.2.2] - 2022-08-06 ### Changed -- All directional blocks no longer transmit a network signal out of the direction. -- All directional blocks no longer accept a network signal from the facing direction. -- Upgrade items now state the applicable destinations in the tooltip. -- Upgrade items can now have a maximum of 1 type per upgrade inventory. -- You can now SHIFT + CLICK transfer resources in the filter slots again. +- All directional blocks no longer transmit a network signal out of the direction. +- All directional blocks no longer accept a network signal from the facing direction. +- Upgrade items now state the applicable destinations in the tooltip. +- Upgrade items can now have a maximum of 1 type per upgrade inventory. +- You can now SHIFT + CLICK transfer resources in the filter slots again. ### Fixed -- Fixed network connection state not rebuilding after using Wrench on a directional block. -- Fixed Grid tooltip being too small in some cases and item durability not being rendered. +- Fixed network connection state not rebuilding after using Wrench on a directional block. +- Fixed Grid tooltip being too small in some cases and item durability not being rendered. ### Added -- Upgrade -- Speed Upgrade -- Stack Upgrade +- Upgrade +- Speed Upgrade +- Stack Upgrade ## [2.0.0-milestone.2.1] - 2022-07-30 ### Changed -- The Importer will now extract as much of 1 resource type as possible, according to the per tick transfer quota, at - once for all the inventory slots. -- The Importer no longer transmits a network signal on the direction it's facing. -- The Importer can now import from the Disk Drive. -- The Importer no longer has a dedicated item/fluid mode. It will import what it's connected to, 1 resource type per - tick is possible. -- Updated to the latest Forge version. -- Ported to Minecraft 1.19.1. +- The Importer will now extract as much of 1 resource type as possible, according to the per tick transfer quota, at + once for all the inventory slots. +- The Importer no longer transmits a network signal on the direction it's facing. +- The Importer can now import from the Disk Drive. +- The Importer no longer has a dedicated item/fluid mode. It will import what it's connected to, 1 resource type per + tick is possible. +- Updated to the latest Forge version. +- Ported to Minecraft 1.19.1. ### Fixed -- Fixed Grid stack zeroing not working correctly when Auto-selected mode is on. -- Fixed transferring items into Grid with NBT tag on Forge not working correctly. +- Fixed Grid stack zeroing not working correctly when Auto-selected mode is on. +- Fixed transferring items into Grid with NBT tag on Forge not working correctly. ### Added -- Importer. -- Emissive rendering. +- Importer. +- Emissive rendering. ## [2.0.0-milestone.2.0] - 2022-07-05 ### Changed -- Ported to Minecraft 1.19. +- Ported to Minecraft 1.19. ### Added -- Added JEI support to Fabric. -- Added REI support to Forge. +- Added JEI support to Fabric. +- Added REI support to Forge. ### Fixed -- Fixed resource filter container updates not arriving properly on Forge. +- Fixed resource filter container updates not arriving properly on Forge. ## [2.0.0-milestone.1.4] - 2022-06-22 ### Added -- The Wrench now dismantles devices when crouching. - - The Disk Drive in item form now supports rendering of disks that were dismantled. - - In order to retain Controller energy, the Controller must now be dismantled. - - All config and upgrades are transferred to the item. -- You can now use any Wrench from other mods in order to rotate or dismantle. -- Item and fluid storage blocks. -- Initial advancements. +- The Wrench now dismantles devices when crouching. + - The Disk Drive in item form now supports rendering of disks that were dismantled. + - In order to retain Controller energy, the Controller must now be dismantled. + - All config and upgrades are transferred to the item. +- You can now use any Wrench from other mods in order to rotate or dismantle. +- Item and fluid storage blocks. +- Initial advancements. ### Fixed -- Fixed inventory contents of devices not retaining their original order when reloading a world. -- Fixed bug where (already opened) Grid doesn't update if a storage is removed. -- Fixed last modified info in the Grid not being persisted. -- Fixed removals in filter inventory not being saved properly. +- Fixed inventory contents of devices not retaining their original order when reloading a world. +- Fixed bug where (already opened) Grid doesn't update if a storage is removed. +- Fixed last modified info in the Grid not being persisted. +- Fixed removals in filter inventory not being saved properly. ### Changed -- Ported to Minecraft 1.18.2. -- Grid auto-selection and JEI/REI synchronization are now two different options. -- Grid display settings are now stored in the client configuration, no longer per-block. -- You now need to crouch with a dye in order to change the color of a device. -- Item storage capacities are now multiples of 1024 to make it more stack-size friendly. -- Storage tooltips now have colors. -- Storage tooltips now show percentage full. -- Item storage tooltips now show amount of stacks and max stacks stored. +- Ported to Minecraft 1.18.2. +- Grid auto-selection and JEI/REI synchronization are now two different options. +- Grid display settings are now stored in the client configuration, no longer per-block. +- You now need to crouch with a dye in order to change the color of a device. +- Item storage capacities are now multiples of 1024 to make it more stack-size friendly. +- Storage tooltips now have colors. +- Storage tooltips now show percentage full. +- Item storage tooltips now show amount of stacks and max stacks stored. ### Removed -- Removed the Patchouli integration. +- Removed the Patchouli integration. ## [2.0.0-milestone.1.3] - 2022-02-12 ### Added -- Forge support. +- Forge support. ### Fixed -- Any block can be rotated now if the item tag matches `c:wrenches`. +- Any block can be rotated now if the item tag matches `c:wrenches`. ## [2.0.0-milestone.1.2] - 2021-12-23 ### Added -- Fluid Storage Part -- Fluid Storage Disk -- Fluid Grid -- Wrench -- Tooltip search in the Grid with unary operator "#". +- Fluid Storage Part +- Fluid Storage Disk +- Fluid Grid +- Wrench +- Tooltip search in the Grid with unary operator "#". ### Fixed -- Fix Disk Drive item filters not being applied when reloading a world. -- Fix Storage Disk contents being scrambled when other mods are being added or removed. -- Fix rendering crash with the Disk Drive. -- Fix colored blocks having incorrect names in WTHIT. -- Prevent loading unloaded chunks. -- Fix various bugs related to networks and chunk loading/unloading. -- Fix not being able to move network devices with mods like Carrier. -- Fix CTRL + CLICK in creative mode not retaining block data. -- Fix item quantity not being formatted in the Grid. -- Fix amount in detailed Grid tooltip being formatted with units. +- Fix Disk Drive item filters not being applied when reloading a world. +- Fix Storage Disk contents being scrambled when other mods are being added or removed. +- Fix rendering crash with the Disk Drive. +- Fix colored blocks having incorrect names in WTHIT. +- Prevent loading unloaded chunks. +- Fix various bugs related to networks and chunk loading/unloading. +- Fix not being able to move network devices with mods like Carrier. +- Fix CTRL + CLICK in creative mode not retaining block data. +- Fix item quantity not being formatted in the Grid. +- Fix amount in detailed Grid tooltip being formatted with units. ### Changed -- Ported to Minecraft 1.18.1. -- Modularized the codebase. -- The capacity of the various fluid storage part and fluid storage disk tiers are now described in bucket form, no - longer in mB form. -- The Wrench now plays a sound effect when used. -- The Wrench works on any block that has the `fabric:wrenchables` tag. Other mods can identify the Refined Storage - wrench by checking the `fabric:wrenches` tag. -- Made energy usage by the Grid and Disk Drive less power-hungry. -- The Controller now displays an energy bar on the item. -- Upgrade Team Reborn Energy API. -- Made block breaking faster. -- Refined Storage now uses the bundled AutoConfig with ClothConfig and bundles ClothConfig. -- Item quantity of "1" is now always being rendered in the Grid. -- Exact mode is now off by default. +- Ported to Minecraft 1.18.1. +- Modularized the codebase. +- The capacity of the various fluid storage part and fluid storage disk tiers are now described in bucket form, no + longer in mB form. +- The Wrench now plays a sound effect when used. +- The Wrench works on any block that has the `fabric:wrenchables` tag. Other mods can identify the Refined Storage + wrench by checking the `fabric:wrenches` tag. +- Made energy usage by the Grid and Disk Drive less power-hungry. +- The Controller now displays an energy bar on the item. +- Upgrade Team Reborn Energy API. +- Made block breaking faster. +- Refined Storage now uses the bundled AutoConfig with ClothConfig and bundles ClothConfig. +- Item quantity of "1" is now always being rendered in the Grid. +- Exact mode is now off by default. ### Removed -- LibBlockAttributes is no longer used and thus no longer bundled with Refined Storage 2. +- LibBlockAttributes is no longer used and thus no longer bundled with Refined Storage 2. ## [2.0.0-milestone.1.1] - 2021-08-16 ### Added -- New Grid size: "Extra large" (12 rows) +- New Grid size: "Extra large" (12 rows) ### Fixed -- Fix crash when transferring items in the Controller screen. -- Fix Disk Drive leds not being stable. -- Fix block variants not being present on Patchouli book entries. +- Fix crash when transferring items in the Controller screen. +- Fix Disk Drive leds not being stable. +- Fix block variants not being present on Patchouli book entries. ### Changed -- Ported to Minecraft 1.17.1. -- Implemented a new networking system. +- Ported to Minecraft 1.17.1. +- Implemented a new networking system. ## [2.0.0-milestone.1.0] - 2021-05-21 ### Added -- Controller -- Grid -- Disk Drive -- Storage Part -- Storage Disk -- Storage Housing -- Construction Core -- Destruction Core -- Cable -- Machine Casing -- Quartz Enriched Iron -- Block of Quartz Enriched Iron -- (Raw) Basic Processor -- (Raw) Improved Processor -- (Raw) Advanced Processor -- Silicon -- Processor Binding -- Integration with Roughly Enough Items in the form of a REI search box mode. -- Integration with ModMenu. -- Integration with Patchouli. -- Integration with AutoConfig1u. -- Integration with ClothConfig. -- Integration with Team Reborn Energy. +- Controller +- Grid +- Disk Drive +- Storage Part +- Storage Disk +- Storage Housing +- Construction Core +- Destruction Core +- Cable +- Machine Casing +- Quartz Enriched Iron +- Block of Quartz Enriched Iron +- (Raw) Basic Processor +- (Raw) Improved Processor +- (Raw) Advanced Processor +- Silicon +- Processor Binding +- Integration with Roughly Enough Items in the form of a REI search box mode. +- Integration with ModMenu. +- Integration with Patchouli. +- Integration with AutoConfig1u. +- Integration with ClothConfig. +- Integration with Team Reborn Energy. ### Changed -- Re-arranged the Disk Drive GUI slightly. The priority button has been moved to the side. -- The "Priority" screen now has a reset button. -- "Whitelist" has been renamed to "Allowlist". -- "Blacklist" has been renamed to "Blocklist". -- Contents of storages in "insert-only" mode are now visible in the Grid. -- The Grid keybindings got changed slightly. Consult the Patchouli documentation. -- The Grid search bar now has much more powerful searching, supporting expressions. Consult the Patchouli documentation. -- A single item in storage can now be larger than 2,147,483,647. -- You can now place directional blocks facing up/down. -- Emissive rendering isn't implemented yet. -- You can now add multiple controllers to a network to meet the energy requirements of your network. -- The Priority screen now has a "Reset" button. -- The Grid can now use smooth scrolling. -- The Grid now has syntax highlighting for the search query. - -[Unreleased]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.4.4...HEAD +- Re-arranged the Disk Drive GUI slightly. The priority button has been moved to the side. +- The "Priority" screen now has a reset button. +- "Whitelist" has been renamed to "Allowlist". +- "Blacklist" has been renamed to "Blocklist". +- Contents of storages in "insert-only" mode are now visible in the Grid. +- The Grid keybindings got changed slightly. Consult the Patchouli documentation. +- The Grid search bar now has much more powerful searching, supporting expressions. Consult the Patchouli documentation. +- A single item in storage can now be larger than 2,147,483,647. +- You can now place directional blocks facing up/down. +- Emissive rendering isn't implemented yet. +- You can now add multiple controllers to a network to meet the energy requirements of your network. +- The Priority screen now has a "Reset" button. +- The Grid can now use smooth scrolling. +- The Grid now has syntax highlighting for the search query. + +[Unreleased]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.4.5...HEAD + +[2.0.0-milestone.4.5]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.4.4...v2.0.0-milestone.4.5 [2.0.0-milestone.4.4]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.4.3...v2.0.0-milestone.4.4