From 439a0b543b6ac4d3a38cbe75a83c2054dfea4fb0 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Tue, 26 May 2020 22:07:12 +0200 Subject: [PATCH] Update package name --- build.gradle | 8 +- .../task/v5/CraftingTaskFactory.java | 28 ----- .../task/v6/CraftingTaskFactory.java | 28 ----- .../screen/grid/sorting/IGridSorter.java | 10 -- .../refinedstorage/RS.java | 18 ++-- .../refinedstorage/RSBlocks.java | 4 +- .../refinedstorage/RSContainers.java | 4 +- .../refinedstorage/RSItems.java | 6 +- .../refinedstorage/RSKeyBindings.java | 2 +- .../refinedstorage/RSTiles.java | 10 +- .../refinedstorage/api/IRSAPI.java | 46 ++++---- .../refinedstorage/api/RSAPIInject.java | 2 +- .../api/autocrafting/ICraftingManager.java | 6 +- .../api/autocrafting/ICraftingPattern.java | 4 +- .../autocrafting/ICraftingPatternChain.java | 2 +- .../ICraftingPatternChainList.java | 2 +- .../ICraftingPatternContainer.java | 2 +- .../ICraftingPatternProvider.java | 2 +- .../ICraftingPatternRenderHandler.java | 5 +- .../ICraftingMonitorElement.java | 6 +- .../ICraftingMonitorElementList.java | 2 +- .../ICraftingMonitorElementRegistry.java | 2 +- .../ICraftingMonitorListener.java | 4 +- .../preview/ICraftingPreviewElement.java | 4 +- .../ICraftingPreviewElementRegistry.java | 2 +- .../task/CraftingTaskErrorType.java | 2 +- .../task/CraftingTaskReadException.java | 4 +- .../task/ICraftingRequestInfo.java | 2 +- .../api/autocrafting/task/ICraftingTask.java | 15 +-- .../autocrafting/task/ICraftingTaskError.java | 4 +- .../task/ICraftingTaskFactory.java | 6 +- .../task/ICraftingTaskRegistry.java | 2 +- .../refinedstorage/api/network/INetwork.java | 24 ++--- .../api/network/INetworkManager.java | 2 +- .../api/network/INetworkNodeGraph.java | 6 +- .../network/INetworkNodeGraphListener.java | 2 +- .../api/network/INetworkNodeVisitor.java | 4 +- .../api/network/IWirelessTransmitter.java | 2 +- .../api/network/NetworkType.java | 2 +- .../api/network/grid/GridFactoryType.java | 2 +- .../api/network/grid/GridType.java | 2 +- .../network/grid/ICraftingGridBehavior.java | 2 +- .../network/grid/ICraftingGridListener.java | 2 +- .../api/network/grid/IGrid.java | 12 +-- .../api/network/grid/IGridFactory.java | 2 +- .../api/network/grid/IGridManager.java | 2 +- .../api/network/grid/IGridTab.java | 6 +- .../api/network/grid/INetworkAwareGrid.java | 4 +- .../grid/handler/IFluidGridHandler.java | 9 +- .../grid/handler/IItemGridHandler.java | 9 +- .../api/network/item/INetworkItem.java | 4 +- .../api/network/item/INetworkItemManager.java | 2 +- .../network/item/INetworkItemProvider.java | 2 +- .../api/network/node/INetworkNode.java | 4 +- .../api/network/node/INetworkNodeFactory.java | 2 +- .../api/network/node/INetworkNodeManager.java | 2 +- .../api/network/node/INetworkNodeProxy.java | 2 +- .../network/node/INetworkNodeRegistry.java | 2 +- .../api/network/security/ISecurityCard.java | 2 +- .../security/ISecurityCardContainer.java | 2 +- .../network/security/ISecurityManager.java | 2 +- .../api/network/security/Permission.java | 2 +- .../api/render/IElementDrawer.java | 6 +- .../api/render/IElementDrawers.java | 2 +- .../api/storage/AccessType.java | 2 +- .../refinedstorage/api/storage/IStorage.java | 6 +- .../api/storage/IStorageProvider.java | 2 +- .../api/storage/StorageType.java | 2 +- .../api/storage/cache/IStorageCache.java | 15 +-- .../storage/cache/IStorageCacheListener.java | 4 +- .../api/storage/cache/InvalidateCause.java | 2 +- .../api/storage/disk/IStorageDisk.java | 4 +- .../disk/IStorageDiskContainerContext.java | 4 +- .../api/storage/disk/IStorageDiskFactory.java | 2 +- .../storage/disk/IStorageDiskListener.java | 2 +- .../api/storage/disk/IStorageDiskManager.java | 2 +- .../storage/disk/IStorageDiskProvider.java | 4 +- .../storage/disk/IStorageDiskRegistry.java | 2 +- .../api/storage/disk/IStorageDiskSync.java | 2 +- .../api/storage/disk/StorageDiskSyncData.java | 2 +- .../externalstorage/IExternalStorage.java | 8 +- .../IExternalStorageContext.java | 4 +- .../IExternalStorageProvider.java | 2 +- .../api/storage/tracker/IStorageTracker.java | 2 +- .../storage/tracker/StorageTrackerEntry.java | 2 +- .../refinedstorage/api/util/Action.java | 2 +- .../refinedstorage/api/util/IComparer.java | 2 +- .../refinedstorage/api/util/IFilter.java | 2 +- .../api/util/IQuantityFormatter.java | 2 +- .../refinedstorage/api/util/IStackList.java | 2 +- .../api/util/StackListEntry.java | 2 +- .../api/util/StackListResult.java | 2 +- .../refinedstorage/apiimpl/API.java | 80 +++++++------- .../apiimpl/autocrafting/AllowedTagList.java | 2 +- .../apiimpl/autocrafting/CraftingManager.java | 28 ++--- .../apiimpl/autocrafting/CraftingPattern.java | 17 +-- .../autocrafting/CraftingPatternChain.java | 6 +- .../CraftingPatternChainList.java | 8 +- .../autocrafting/CraftingPatternFactory.java | 6 +- .../CraftingPatternFactoryException.java | 2 +- .../CraftingMonitorElementList.java | 6 +- .../CraftingMonitorElementRegistry.java | 6 +- .../ErrorCraftingMonitorElement.java | 10 +- .../FluidCraftingMonitorElement.java | 13 ++- .../ItemCraftingMonitorElement.java | 15 ++- .../CraftingPreviewElementRegistry.java | 6 +- .../preview/ErrorCraftingPreviewElement.java | 10 +- .../preview/FluidCraftingPreviewElement.java | 13 ++- .../preview/ItemCraftingPreviewElement.java | 11 +- .../task/CraftingRequestInfo.java | 8 +- .../task/CraftingTaskRegistry.java | 6 +- .../autocrafting/task/v5/Crafting.java | 12 +-- .../autocrafting/task/v5/CraftingTask.java | 50 ++++----- .../task/v5}/CraftingTaskError.java | 8 +- .../task/v5/CraftingTaskFactory.java | 28 +++++ .../autocrafting/task/v5/Processing.java | 10 +- .../autocrafting/task/v5/ProcessingState.java | 2 +- .../apiimpl/autocrafting/task/v5/README.md | 0 .../apiimpl/autocrafting/task/v6/Craft.java | 16 +-- .../autocrafting/task/v6/Crafting.java | 10 +- .../autocrafting/task/v6/CraftingTask.java | 70 ++++++------ .../task/v6}/CraftingTaskError.java | 8 +- .../task/v6/CraftingTaskFactory.java | 28 +++++ .../autocrafting/task/v6/Processing.java | 14 +-- .../autocrafting/task/v6/ProcessingState.java | 2 +- .../apiimpl/network/Network.java | 68 ++++++------ .../apiimpl/network/NetworkListener.java | 6 +- .../apiimpl/network/NetworkManager.java | 8 +- .../apiimpl/network/NetworkNodeGraph.java | 16 +-- .../apiimpl/network/NetworkNodeListener.java | 14 +-- .../apiimpl/network/NetworkNodeManager.java | 10 +- .../apiimpl/network/NetworkNodeRegistry.java | 6 +- .../network/grid/CraftingGridBehavior.java | 20 ++-- .../apiimpl/network/grid/GridManager.java | 10 +- .../apiimpl/network/grid/GridTab.java | 8 +- .../grid/factory/GridBlockGridFactory.java | 12 +-- .../factory/PortableGridBlockGridFactory.java | 12 +-- .../grid/factory/PortableGridGridFactory.java | 12 +-- .../factory/WirelessFluidGridGridFactory.java | 12 +-- .../grid/factory/WirelessGridGridFactory.java | 12 +-- .../grid/handler/FluidGridHandler.java | 26 ++--- .../network/grid/handler/ItemGridHandler.java | 24 ++--- .../handler/PortableFluidGridHandler.java | 16 +-- .../grid/handler/PortableItemGridHandler.java | 16 +-- .../network/item/NetworkItemManager.java | 14 +-- .../WirelessCraftingMonitorNetworkItem.java | 22 ++-- .../item/WirelessFluidGridNetworkItem.java | 20 ++-- .../network/item/WirelessGridNetworkItem.java | 20 ++-- .../network/node/CableNetworkNode.java | 4 +- .../node/ConnectivityStateChangeCause.java | 2 +- .../network/node/ConstructorNetworkNode.java | 30 +++--- .../node/CrafterManagerNetworkNode.java | 12 +-- .../network/node/CrafterNetworkNode.java | 30 +++--- .../node/CraftingMonitorNetworkNode.java | 20 ++-- .../network/node/DestructorNetworkNode.java | 32 +++--- .../network/node/DetectorNetworkNode.java | 30 +++--- .../apiimpl/network/node/DiskState.java | 2 +- .../network/node/ExporterNetworkNode.java | 32 +++--- .../node/ExternalStorageNetworkNode.java | 48 ++++----- .../node/FluidInterfaceNetworkNode.java | 34 +++--- .../apiimpl/network/node/GridNetworkNode.java | 58 +++++----- .../apiimpl/network/node/IStorageScreen.java | 6 +- .../network/node/ImporterNetworkNode.java | 34 +++--- .../network/node/InterfaceNetworkNode.java | 30 +++--- .../apiimpl/network/node/NetworkNode.java | 18 ++-- .../node/NetworkReceiverNetworkNode.java | 4 +- .../node/NetworkTransmitterNetworkNode.java | 21 ++-- .../network/node/RelayNetworkNode.java | 6 +- .../apiimpl/network/node/RootNetworkNode.java | 10 +- .../node/SecurityManagerNetworkNode.java | 26 ++--- .../network/node/SlottedCraftingRequest.java | 4 +- .../node/StorageMonitorNetworkNode.java | 32 +++--- .../node/WirelessTransmitterNetworkNode.java | 16 +-- .../node/diskdrive/DiskDriveNetworkNode.java | 50 ++++----- .../FluidDriveWrapperStorageDisk.java | 18 ++-- .../ItemDriveWrapperStorageDisk.java | 16 +-- .../DiskManipulatorNetworkNode.java | 48 ++++----- .../StorageDiskFluidManipulatorWrapper.java | 20 ++-- .../StorageDiskItemManipulatorWrapper.java | 18 ++-- .../node/storage/FluidStorageNetworkNode.java | 52 ++++----- .../FluidStorageWrapperStorageDisk.java | 16 +-- .../ItemStorageWrapperStorageDisk.java | 14 +-- .../node/storage/StorageNetworkNode.java | 54 +++++----- .../network/security/SecurityCard.java | 6 +- .../network/security/SecurityManager.java | 14 +-- .../render/CraftingMonitorElementDrawers.java | 9 +- .../render/CraftingPreviewElementDrawers.java | 7 +- .../apiimpl/render/ElementDrawers.java | 10 +- .../apiimpl/storage/FluidStorageType.java | 2 +- .../apiimpl/storage/ItemStorageType.java | 2 +- .../storage/cache/FluidStorageCache.java | 22 ++-- .../storage/cache/ItemStorageCache.java | 22 ++-- .../cache/PortableFluidStorageCache.java | 18 ++-- .../cache/PortableItemStorageCache.java | 18 ++-- .../FluidGridStorageCacheListener.java | 16 +-- .../ItemGridStorageCacheListener.java | 16 +-- ...PortableFluidGridStorageCacheListener.java | 14 +-- .../PortableItemGridStorageCacheListener.java | 14 +-- .../storage/disk/FluidStorageDisk.java | 18 ++-- .../apiimpl/storage/disk/ItemStorageDisk.java | 18 ++-- .../disk/PortableFluidStorageDisk.java | 14 +-- .../storage/disk/PortableItemStorageDisk.java | 14 +-- .../storage/disk/StorageDiskManager.java | 12 +-- .../storage/disk/StorageDiskRegistry.java | 6 +- .../apiimpl/storage/disk/StorageDiskSync.java | 10 +- .../disk/factory/FluidStorageDiskFactory.java | 10 +- .../disk/factory/ItemStorageDiskFactory.java | 12 +-- .../externalstorage/FluidExternalStorage.java | 14 +-- .../FluidExternalStorageCache.java | 8 +- .../FluidExternalStorageProvider.java | 12 +-- .../externalstorage/ItemExternalStorage.java | 14 +-- .../ItemExternalStorageCache.java | 6 +- .../ItemExternalStorageProvider.java | 18 ++-- .../storage/tracker/FluidStorageTracker.java | 10 +- .../storage/tracker/ItemStorageTracker.java | 10 +- .../refinedstorage/apiimpl/util/Comparer.java | 4 +- .../apiimpl/util/FluidFilter.java | 4 +- .../apiimpl/util/FluidStackList.java | 10 +- .../apiimpl/util/ItemFilter.java | 4 +- .../apiimpl/util/ItemStackList.java | 10 +- .../apiimpl/util/QuantityFormatter.java | 6 +- .../refinedstorage/block/BaseBlock.java | 2 +- .../refinedstorage/block/BlockDirection.java | 4 +- .../refinedstorage/block/BlockListener.java | 2 +- .../refinedstorage/block/CableBlock.java | 10 +- .../block/ConstructorBlock.java | 16 +-- .../refinedstorage/block/ControllerBlock.java | 14 +-- .../refinedstorage/block/CrafterBlock.java | 16 +-- .../block/CrafterManagerBlock.java | 14 +-- .../block/CraftingMonitorBlock.java | 16 +-- .../refinedstorage/block/DestructorBlock.java | 16 +-- .../refinedstorage/block/DetectorBlock.java | 14 +-- .../refinedstorage/block/DiskDriveBlock.java | 14 +-- .../block/DiskManipulatorBlock.java | 14 +-- .../refinedstorage/block/ExporterBlock.java | 16 +-- .../block/ExternalStorageBlock.java | 22 ++-- .../block/FluidInterfaceBlock.java | 16 +-- .../block/FluidStorageBlock.java | 18 ++-- .../refinedstorage/block/GridBlock.java | 16 +-- .../refinedstorage/block/ImporterBlock.java | 16 +-- .../refinedstorage/block/InterfaceBlock.java | 16 +-- .../block/MachineCasingBlock.java | 6 +- .../block/NetworkNodeBlock.java | 10 +- .../block/NetworkReceiverBlock.java | 8 +- .../block/NetworkTransmitterBlock.java | 14 +-- .../block/PortableGridBlock.java | 16 +-- .../block/QuartzEnrichedIronBlock.java | 6 +- .../refinedstorage/block/RelayBlock.java | 14 +-- .../block/SecurityManagerBlock.java | 16 +-- .../refinedstorage/block/StorageBlock.java | 18 ++-- .../block/StorageMonitorBlock.java | 18 ++-- .../block/WirelessTransmitterBlock.java | 27 +++-- .../NetworkNodeProxyCapability.java | 6 +- .../command/CommandCreateDisk.java | 8 +- .../command/PatternDumpCommand.java | 10 +- .../refinedstorage/config/ClientConfig.java | 2 +- .../refinedstorage/config/ServerConfig.java | 2 +- .../container/AlternativesContainer.java | 2 +- .../container/AmountContainer.java | 4 +- .../container/BaseContainer.java | 24 ++--- .../container/ConstructorContainer.java | 12 +-- .../container/ControllerContainer.java | 6 +- .../container/CrafterContainer.java | 6 +- .../container/CrafterManagerContainer.java | 26 ++--- .../container/CraftingMonitorContainer.java | 14 +-- .../container/CraftingSettingsContainer.java | 14 +-- .../container/DestructorContainer.java | 12 +-- .../container/DetectorContainer.java | 12 +-- .../container/DiskDriveContainer.java | 12 +-- .../container/DiskManipulatorContainer.java | 12 +-- .../container/ExporterContainer.java | 14 +-- .../container/ExternalStorageContainer.java | 12 +-- .../container/FilterContainer.java | 22 ++-- .../container/FluidAmountContainer.java | 6 +- .../container/FluidInterfaceContainer.java | 10 +- .../container/FluidStorageContainer.java | 8 +- .../container/GridContainer.java | 42 ++++---- .../container/ImporterContainer.java | 12 +-- .../container/InterfaceContainer.java | 10 +- .../NetworkTransmitterContainer.java | 6 +- .../container/RelayContainer.java | 6 +- .../container/SecurityManagerContainer.java | 6 +- .../container/StorageContainer.java | 8 +- .../container/StorageMonitorContainer.java | 12 +-- .../WirelessTransmitterContainer.java | 6 +- .../CrafterManagerContainerFactory.java | 8 +- .../CrafterManagerContainerProvider.java | 8 +- .../CraftingMonitorContainerFactory.java | 8 +- .../CraftingMonitorContainerProvider.java | 8 +- .../factory/GridContainerFactory.java | 10 +- .../factory/GridContainerProvider.java | 10 +- .../PositionalTileContainerFactory.java | 2 +- .../PositionalTileContainerProvider.java | 2 +- ...relessCraftingMonitorContainerFactory.java | 8 +- .../container/slot/BaseSlot.java | 2 +- .../container/slot/CrafterManagerSlot.java | 6 +- .../container/slot/DisabledSlot.java | 2 +- .../container/slot/OutputSlot.java | 2 +- .../slot/filter/DisabledFluidFilterSlot.java | 4 +- .../container/slot/filter/FilterSlot.java | 4 +- .../slot/filter/FluidFilterSlot.java | 8 +- .../container/slot/grid/CraftingGridSlot.java | 2 +- .../slot/grid/ResultCraftingGridSlot.java | 4 +- .../container/slot/legacy/LegacyBaseSlot.java | 2 +- .../slot/legacy/LegacyDisabledSlot.java | 2 +- .../slot/legacy/LegacyFilterSlot.java | 2 +- .../transfer/FilterInventoryWrapper.java | 6 +- .../transfer/FluidFilterInventoryWrapper.java | 10 +- .../container/transfer/IInventoryWrapper.java | 2 +- .../container/transfer/InsertionResult.java | 2 +- .../transfer/InsertionResultType.java | 2 +- .../transfer/InventoryInventoryWrapper.java | 2 +- .../transfer/ItemFilterInventoryWrapper.java | 4 +- .../transfer/ItemHandlerInventoryWrapper.java | 2 +- .../container/transfer/TransferManager.java | 6 +- .../energy/BaseEnergyStorage.java | 2 +- .../energy/ItemEnergyStorage.java | 2 +- .../CraftingTweaksIntegration.java | 8 +- .../InventorySorterIntegration.java | 4 +- .../InventoryTweaksIntegration.java | 2 +- .../jei/GhostIngredientHandler.java | 10 +- .../jei/GridRecipeTransferHandler.java | 14 +-- .../integration/jei/GuiContainerHandler.java | 12 +-- .../integration/jei/JeiIntegration.java | 2 +- .../integration/jei/RSJeiPlugin.java | 6 +- .../inventory/fluid/FilterFluidInventory.java | 4 +- .../fluid/FilterIconFluidInventory.java | 4 +- .../inventory/fluid/FluidInventory.java | 4 +- .../inventory/fluid/ProxyFluidHandler.java | 2 +- .../inventory/item/BaseItemHandler.java | 4 +- .../inventory/item/FilterIconItemHandler.java | 4 +- .../inventory/item/FilterItemHandler.java | 24 ++--- .../item/FilterItemsItemHandler.java | 4 +- .../inventory/item/ProxyItemHandler.java | 2 +- .../inventory/item/UpgradeItemHandler.java | 6 +- .../item/validator/ItemValidator.java | 2 +- .../item/validator/PatternItemValidator.java | 4 +- .../validator/StorageDiskItemValidator.java | 4 +- .../item/validator/UpgradeItemValidator.java | 4 +- .../inventory/listener/InventoryListener.java | 2 +- .../NetworkNodeFluidInventoryListener.java | 6 +- .../NetworkNodeInventoryListener.java | 6 +- .../listener/TileInventoryListener.java | 4 +- .../refinedstorage/item/CoreItem.java | 4 +- .../refinedstorage/item/EnergyItem.java | 6 +- .../refinedstorage/item/FilterItem.java | 22 ++-- .../item/FluidStorageDiskItem.java | 20 ++-- .../item/FluidStoragePartItem.java | 8 +- .../refinedstorage/item/NetworkCardItem.java | 8 +- .../refinedstorage/item/NetworkItem.java | 10 +- .../refinedstorage/item/PatternItem.java | 24 ++--- .../item/ProcessorBindingItem.java | 4 +- .../refinedstorage/item/ProcessorItem.java | 4 +- .../item/QuartzEnrichedIronItem.java | 4 +- .../refinedstorage/item/SecurityCardItem.java | 8 +- .../refinedstorage/item/SiliconItem.java | 4 +- .../refinedstorage/item/StorageDiskItem.java | 20 ++-- .../item/StorageHousingItem.java | 4 +- .../refinedstorage/item/StoragePartItem.java | 8 +- .../refinedstorage/item/UpgradeItem.java | 6 +- .../item/WirelessCraftingMonitorItem.java | 10 +- .../item/WirelessFluidGridItem.java | 14 +-- .../refinedstorage/item/WirelessGridItem.java | 14 +-- .../refinedstorage/item/WrenchItem.java | 12 +-- .../item/blockitem/BaseBlockItem.java | 6 +- .../item/blockitem/ControllerBlockItem.java | 10 +- .../item/blockitem/EnergyBlockItem.java | 8 +- .../item/blockitem/FluidStorageBlockItem.java | 24 ++--- .../item/blockitem/PortableGridBlockItem.java | 14 +-- .../item/blockitem/StorageBlockItem.java | 23 ++-- .../WirelessTransmitterBlockItem.java | 8 +- .../EnergyCapabilityProvider.java | 4 +- .../item/group/MainItemGroup.java | 6 +- .../loottable/ControllerLootFunction.java | 6 +- .../ControllerLootFunctionSerializer.java | 4 +- .../loottable/CrafterLootFunction.java | 6 +- .../CrafterLootFunctionSerializer.java | 4 +- .../PortableGridBlockLootFunction.java | 4 +- ...rtableGridBlockLootFunctionSerializer.java | 4 +- .../loottable/StorageBlockLootFunction.java | 10 +- .../StorageBlockLootFunctionSerializer.java | 4 +- .../refinedstorage/network/ClientProxy.java | 16 +-- .../network/FilterUpdateMessage.java | 8 +- .../network/FluidFilterSlotUpdateMessage.java | 6 +- .../network/NetworkHandler.java | 20 ++-- .../network/OpenNetworkItemMessage.java | 10 +- .../network/SecurityManagerUpdateMessage.java | 6 +- .../network/SetFilterSlotMessage.java | 8 +- .../network/SetFluidFilterSlotMessage.java | 8 +- .../CraftingMonitorCancelMessage.java | 4 +- .../CraftingMonitorUpdateMessage.java | 20 ++-- ...sCraftingMonitorSettingsUpdateMessage.java | 6 +- .../disk/StorageDiskSizeRequestMessage.java | 8 +- .../disk/StorageDiskSizeResponseMessage.java | 8 +- .../network/grid/GridClearMessage.java | 4 +- .../GridCraftingPreviewRequestMessage.java | 6 +- .../GridCraftingPreviewResponseMessage.java | 8 +- .../grid/GridCraftingStartRequestMessage.java | 6 +- .../GridCraftingStartResponseMessage.java | 4 +- .../network/grid/GridFluidDeltaMessage.java | 18 ++-- .../grid/GridFluidInsertHeldMessage.java | 6 +- .../network/grid/GridFluidPullMessage.java | 6 +- .../network/grid/GridFluidUpdateMessage.java | 18 ++-- .../network/grid/GridItemDeltaMessage.java | 18 ++-- .../grid/GridItemInsertHeldMessage.java | 6 +- .../network/grid/GridItemPullMessage.java | 6 +- .../network/grid/GridItemUpdateMessage.java | 18 ++-- .../grid/GridPatternCreateMessage.java | 6 +- .../grid/GridProcessingTransferMessage.java | 16 +-- .../network/grid/GridTransferMessage.java | 10 +- .../grid/PortableGridFluidDeltaMessage.java | 14 +-- .../grid/PortableGridFluidUpdateMessage.java | 16 +-- .../grid/PortableGridItemDeltaMessage.java | 14 +-- .../grid/PortableGridItemUpdateMessage.java | 16 +-- .../PortableGridSettingsUpdateMessage.java | 10 +- ...irelessFluidGridSettingsUpdateMessage.java | 10 +- .../WirelessGridSettingsUpdateMessage.java | 10 +- .../tiledata/TileDataParameterMessage.java | 6 +- .../TileDataParameterUpdateMessage.java | 8 +- .../UpgradeWithEnchantedBookRecipe.java | 4 +- ...radeWithEnchantedBookRecipeSerializer.java | 2 +- .../render/BakedModelOverrideRegistry.java | 2 +- .../refinedstorage/render/FluidRenderer.java | 2 +- .../refinedstorage/render/RenderSettings.java | 2 +- .../refinedstorage/render/Styles.java | 2 +- .../render/color/PatternItemColor.java | 8 +- .../render/model/DelegateBakedModel.java | 2 +- .../render/model/DiskDriveBakedModel.java | 8 +- .../model/DiskManipulatorBakedModel.java | 10 +- .../render/model/FullbrightBakedModel.java | 2 +- .../render/model/PatternBakedModel.java | 10 +- .../render/model/PortableGridBakedModel.java | 10 +- .../model/PortableGridItemBakedModel.java | 2 +- .../render/model/TRSRBakedModel.java | 2 +- .../resourcepack/RSResourcePackSection.java | 2 +- .../RSResourcePackSectionDeserializer.java | 2 +- .../resourcepack/ResourcePackListener.java | 4 +- .../tesr/PatternItemStackTileRenderer.java | 6 +- .../tesr/StorageMonitorTileRenderer.java | 12 +-- .../screen/AmountSpecifyingScreen.java | 7 +- .../refinedstorage/screen/BaseScreen.java | 24 ++--- .../screen/ConstructorScreen.java | 16 +-- .../screen/ControllerScreen.java | 20 ++-- .../screen/CrafterManagerScreen.java | 28 ++--- .../refinedstorage/screen/CrafterScreen.java | 8 +- ...rafterTileDataParameterClientListener.java | 6 +- .../screen/CraftingMonitorScreen.java | 38 ++++--- .../screen/DestructorScreen.java | 10 +- .../refinedstorage/screen/DetectorScreen.java | 18 ++-- .../screen/DiskDriveScreen.java | 6 +- .../screen/DiskManipulatorScreen.java | 10 +- .../screen/EmptyScreenInfoProvider.java | 2 +- .../refinedstorage/screen/ExporterScreen.java | 16 +-- .../screen/ExternalStorageScreen.java | 6 +- .../refinedstorage/screen/FilterScreen.java | 20 ++-- .../screen/FluidAmountScreen.java | 10 +- .../screen/FluidInterfaceScreen.java | 18 ++-- .../screen/FluidStorageBlockScreen.java | 6 +- .../screen/IScreenInfoProvider.java | 2 +- .../refinedstorage/screen/ImporterScreen.java | 16 +-- .../screen/InterfaceScreen.java | 12 +-- .../screen/ItemAmountScreen.java | 8 +- .../screen/KeyInputListener.java | 10 +- .../screen/NetworkTransmitterScreen.java | 10 +- .../refinedstorage/screen/PriorityScreen.java | 6 +- .../refinedstorage/screen/RelayScreen.java | 10 +- .../screen/SecurityManagerScreen.java | 20 ++-- .../screen/StorageBlockScreen.java | 6 +- .../screen/StorageMonitorScreen.java | 12 +-- .../refinedstorage/screen/StorageScreen.java | 14 +-- .../screen/WirelessTransmitterScreen.java | 10 +- .../factory/CrafterManagerScreenFactory.java | 6 +- .../screen/factory/GridScreenFactory.java | 6 +- .../screen/grid/AlternativesScreen.java | 22 ++-- .../screen/grid/CraftingPreviewScreen.java | 32 +++--- .../screen/grid/CraftingSettingsScreen.java | 16 +-- .../screen/grid/GridScreen.java | 60 +++++------ .../grid/filtering/CraftableGridFilter.java | 4 +- .../grid/filtering/FilterGridFilter.java | 12 +-- .../grid/filtering/GridFilterParser.java | 8 +- .../screen/grid/filtering/ModGridFilter.java | 4 +- .../screen/grid/filtering/NameGridFilter.java | 4 +- .../screen/grid/filtering/OrGridFilter.java | 4 +- .../screen/grid/filtering/TagGridFilter.java | 4 +- .../grid/filtering/TooltipGridFilter.java | 4 +- .../screen/grid/sorting/IGridSorter.java | 10 ++ .../screen/grid/sorting/IdGridSorter.java | 6 +- .../sorting/InventoryTweaksGridSorter.java | 6 +- .../grid/sorting/LastModifiedGridSorter.java | 6 +- .../screen/grid/sorting/NameGridSorter.java | 6 +- .../grid/sorting/QuantityGridSorter.java | 6 +- .../screen/grid/sorting/SortingDirection.java | 2 +- .../screen/grid/stack/FluidGridStack.java | 12 +-- .../screen/grid/stack/IGridStack.java | 6 +- .../screen/grid/stack/ItemGridStack.java | 12 +-- .../screen/grid/view/BaseGridView.java | 14 +-- .../screen/grid/view/FluidGridView.java | 10 +- .../screen/grid/view/IGridView.java | 4 +- .../screen/grid/view/ItemGridView.java | 10 +- .../screen/widget/CheckboxWidget.java | 2 +- .../screen/widget/ScrollbarWidget.java | 13 ++- .../widget/ScrollbarWidgetListener.java | 2 +- .../screen/widget/SearchWidget.java | 14 +-- .../screen/widget/TabListWidget.java | 13 ++- .../sidebutton/AccessTypeSideButton.java | 12 +-- .../sidebutton/ConstructorDropSideButton.java | 8 +- ...CrafterManagerSearchBoxModeSideButton.java | 12 +-- .../sidebutton/CrafterModeSideButton.java | 8 +- .../DestructorPickupSideButton.java | 8 +- .../sidebutton/DetectorModeSideButton.java | 10 +- .../sidebutton/ExactModeSideButton.java | 10 +- .../sidebutton/FilterTypeSideButton.java | 6 +- .../GridSearchBoxModeSideButton.java | 8 +- .../widget/sidebutton/GridSizeSideButton.java | 6 +- .../GridSortingDirectionSideButton.java | 6 +- .../sidebutton/GridSortingTypeSideButton.java | 12 +-- .../sidebutton/GridViewTypeSideButton.java | 6 +- .../widget/sidebutton/IoModeSideButton.java | 10 +- .../sidebutton/RedstoneModeSideButton.java | 8 +- .../screen/widget/sidebutton/SideButton.java | 9 +- .../widget/sidebutton/TypeSideButton.java | 10 +- .../WhitelistBlacklistSideButton.java | 10 +- .../refinedstorage/setup/ClientSetup.java | 28 ++--- .../refinedstorage/setup/CommonSetup.java | 100 +++++++++--------- .../refinedstorage/setup/ServerSetup.java | 4 +- .../refinedstorage/tile/BaseTile.java | 4 +- .../refinedstorage/tile/CableTile.java | 6 +- .../refinedstorage/tile/ClientNode.java | 4 +- .../refinedstorage/tile/ConstructorTile.java | 12 +-- .../refinedstorage/tile/ControllerTile.java | 32 +++--- .../tile/CrafterManagerTile.java | 14 +-- .../refinedstorage/tile/CrafterTile.java | 10 +- .../refinedstorage/tile/DestructorTile.java | 14 +-- .../refinedstorage/tile/DetectorTile.java | 12 +-- .../refinedstorage/tile/DiskDriveTile.java | 20 ++-- .../tile/DiskManipulatorTile.java | 18 ++-- .../refinedstorage/tile/ExporterTile.java | 12 +-- .../tile/ExternalStorageTile.java | 16 +-- .../tile/FluidInterfaceTile.java | 10 +- .../refinedstorage/tile/FluidStorageTile.java | 22 ++-- .../refinedstorage/tile/ImporterTile.java | 14 +-- .../refinedstorage/tile/InterfaceTile.java | 10 +- .../refinedstorage/tile/NetworkNodeTile.java | 22 ++-- .../tile/NetworkReceiverTile.java | 6 +- .../tile/NetworkTransmitterTile.java | 10 +- .../refinedstorage/tile/RelayTile.java | 6 +- .../tile/SecurityManagerTile.java | 6 +- .../tile/StorageMonitorTile.java | 12 +-- .../refinedstorage/tile/StorageTile.java | 22 ++-- .../tile/WirelessTransmitterTile.java | 8 +- .../tile/config/IAccessType.java | 10 +- .../tile/config/IComparable.java | 6 +- .../tile/config/IPrioritizable.java | 6 +- .../tile/config/IRedstoneConfigurable.java | 2 +- .../refinedstorage/tile/config/IType.java | 10 +- .../tile/config/IWhitelistBlacklist.java | 10 +- .../tile/config/RedstoneMode.java | 4 +- .../craftingmonitor/CraftingMonitorTile.java | 10 +- .../craftingmonitor/ICraftingMonitor.java | 8 +- .../WirelessCraftingMonitor.java | 18 ++-- .../tile/data/RSSerializers.java | 8 +- .../tile/data/TileDataManager.java | 6 +- .../tile/data/TileDataParameter.java | 2 +- .../data/TileDataParameterClientListener.java | 2 +- .../tile/data/TileDataWatcher.java | 6 +- .../refinedstorage/tile/grid/GridTile.java | 22 ++-- .../tile/grid/WirelessFluidGrid.java | 34 +++--- .../tile/grid/WirelessGrid.java | 34 +++--- .../tile/grid/portable/IPortableGrid.java | 10 +- .../tile/grid/portable/PortableGrid.java | 78 +++++++------- .../grid/portable/PortableGridDiskState.java | 2 +- .../tile/grid/portable/PortableGridTile.java | 98 ++++++++--------- .../refinedstorage/util/AccessTypeUtils.java | 4 +- .../refinedstorage/util/BlockUtils.java | 8 +- .../refinedstorage/util/CollisionUtils.java | 2 +- .../refinedstorage/util/DirectionUtils.java | 2 +- .../util/FluidStorageBlockUtils.java | 10 +- .../refinedstorage/util/GridUtils.java | 10 +- .../refinedstorage/util/NetworkUtils.java | 16 +-- .../util/PacketBufferUtils.java | 2 +- .../refinedstorage/util/RenderUtils.java | 10 +- .../refinedstorage/util/StackUtils.java | 16 +-- .../util/StorageBlockUtils.java | 10 +- .../refinedstorage/util/TimeUtils.java | 2 +- .../refinedstorage/util/WorldUtils.java | 4 +- 585 files changed, 3196 insertions(+), 3205 deletions(-) delete mode 100644 src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskFactory.java delete mode 100644 src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTaskFactory.java delete mode 100644 src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/IGridSorter.java rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/RS.java (81%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/RSBlocks.java (98%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/RSContainers.java (97%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/RSItems.java (97%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/RSKeyBindings.java (97%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/RSTiles.java (94%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/IRSAPI.java (74%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/RSAPIInject.java (82%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/autocrafting/ICraftingManager.java (95%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/autocrafting/ICraftingPattern.java (94%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/autocrafting/ICraftingPatternChain.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/autocrafting/ICraftingPatternChainList.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/autocrafting/ICraftingPatternContainer.java (98%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/autocrafting/ICraftingPatternProvider.java (92%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/autocrafting/ICraftingPatternRenderHandler.java (69%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java (87%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementList.java (95%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementRegistry.java (92%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorListener.java (69%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java (91%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/autocrafting/preview/ICraftingPreviewElementRegistry.java (93%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/autocrafting/task/CraftingTaskErrorType.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/autocrafting/task/CraftingTaskReadException.java (71%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/autocrafting/task/ICraftingRequestInfo.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/autocrafting/task/ICraftingTask.java (82%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/autocrafting/task/ICraftingTaskError.java (80%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/autocrafting/task/ICraftingTaskFactory.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/autocrafting/task/ICraftingTaskRegistry.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/INetwork.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/INetworkManager.java (95%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/INetworkNodeGraph.java (86%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/INetworkNodeGraphListener.java (75%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/INetworkNodeVisitor.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/IWirelessTransmitter.java (91%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/NetworkType.java (76%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/grid/GridFactoryType.java (78%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/grid/GridType.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/grid/ICraftingGridBehavior.java (94%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/grid/ICraftingGridListener.java (87%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/grid/IGrid.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/grid/IGridFactory.java (95%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/grid/IGridManager.java (97%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/grid/IGridTab.java (84%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/grid/INetworkAwareGrid.java (68%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/grid/handler/IFluidGridHandler.java (85%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/grid/handler/IItemGridHandler.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/item/INetworkItem.java (86%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/item/INetworkItemManager.java (95%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/item/INetworkItemProvider.java (91%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/node/INetworkNode.java (95%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/node/INetworkNodeFactory.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/node/INetworkNodeManager.java (94%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/node/INetworkNodeProxy.java (89%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/node/INetworkNodeRegistry.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/security/ISecurityCard.java (88%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/security/ISecurityCardContainer.java (89%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/security/ISecurityManager.java (88%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/network/security/Permission.java (92%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/render/IElementDrawer.java (75%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/render/IElementDrawers.java (95%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/AccessType.java (90%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/IStorage.java (93%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/IStorageProvider.java (89%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/StorageType.java (59%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/cache/IStorageCache.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/cache/IStorageCacheListener.java (84%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/cache/InvalidateCause.java (76%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/disk/IStorageDisk.java (89%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/disk/IStorageDiskContainerContext.java (65%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/disk/IStorageDiskFactory.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/disk/IStorageDiskListener.java (73%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/disk/IStorageDiskManager.java (94%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/disk/IStorageDiskProvider.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/disk/IStorageDiskRegistry.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/disk/IStorageDiskSync.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/disk/StorageDiskSyncData.java (89%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/externalstorage/IExternalStorage.java (73%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/externalstorage/IExternalStorageContext.java (84%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/externalstorage/IExternalStorageProvider.java (95%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/tracker/IStorageTracker.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/storage/tracker/StorageTrackerEntry.java (89%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/util/Action.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/util/IComparer.java (97%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/util/IFilter.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/util/IQuantityFormatter.java (97%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/util/IStackList.java (98%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/util/StackListEntry.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/api/util/StackListResult.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/API.java (76%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/AllowedTagList.java (98%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/CraftingManager.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/CraftingPattern.java (93%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/CraftingPatternChain.java (73%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java (82%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java (97%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/CraftingPatternFactoryException.java (85%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementList.java (94%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementRegistry.java (72%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java (85%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementRegistry.java (73%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java (82%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java (89%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/task/CraftingRequestInfo.java (85%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/task/CraftingTaskRegistry.java (69%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/task/v5/Crafting.java (85%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTask.java (96%) rename src/main/java/com/{raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6 => refinedmods/refinedstorage/apiimpl/autocrafting/task/v5}/CraftingTaskError.java (68%) create mode 100644 src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskFactory.java rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/task/v5/Processing.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/task/v5/ProcessingState.java (64%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/task/v5/README.md (100%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/task/v6/Craft.java (89%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/task/v6/Crafting.java (79%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java (94%) rename src/main/java/com/{raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5 => refinedmods/refinedstorage/apiimpl/autocrafting/task/v6}/CraftingTaskError.java (68%) create mode 100644 src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTaskFactory.java rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/task/v6/Processing.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/autocrafting/task/v6/ProcessingState.java (61%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/Network.java (87%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/NetworkListener.java (79%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/NetworkManager.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/NetworkNodeGraph.java (92%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/NetworkNodeListener.java (87%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/NetworkNodeManager.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/NetworkNodeRegistry.java (71%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/grid/CraftingGridBehavior.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/grid/GridManager.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/grid/GridTab.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/grid/factory/GridBlockGridFactory.java (74%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/grid/factory/PortableGridBlockGridFactory.java (74%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/grid/factory/PortableGridGridFactory.java (72%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/grid/factory/WirelessFluidGridGridFactory.java (71%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/grid/factory/WirelessGridGridFactory.java (71%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/item/NetworkItemManager.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java (80%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java (79%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java (79%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/CableNetworkNode.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/ConnectivityStateChangeCause.java (63%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/CrafterManagerNetworkNode.java (85%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java (85%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/DiskState.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java (85%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/GridNetworkNode.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/IStorageScreen.java (73%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/NetworkNode.java (92%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/NetworkReceiverNetworkNode.java (84%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/RelayNetworkNode.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/RootNetworkNode.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/SecurityManagerNetworkNode.java (82%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/SlottedCraftingRequest.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java (80%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java (84%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/diskdrive/FluidDriveWrapperStorageDisk.java (80%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/diskdrive/ItemDriveWrapperStorageDisk.java (82%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskItemManipulatorWrapper.java (82%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/storage/FluidStorageNetworkNode.java (82%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/storage/FluidStorageWrapperStorageDisk.java (80%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/storage/ItemStorageWrapperStorageDisk.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/security/SecurityCard.java (74%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/network/security/SecurityManager.java (78%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java (74%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/render/ElementDrawers.java (73%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/FluidStorageType.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/ItemStorageType.java (89%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/cache/FluidStorageCache.java (85%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/cache/ItemStorageCache.java (85%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/cache/PortableFluidStorageCache.java (79%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/cache/PortableItemStorageCache.java (79%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/cache/listener/FluidGridStorageCacheListener.java (67%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/cache/listener/ItemGridStorageCacheListener.java (67%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/cache/listener/PortableFluidGridStorageCacheListener.java (70%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/cache/listener/PortableItemGridStorageCacheListener.java (69%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/disk/PortableFluidStorageDisk.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/disk/PortableItemStorageDisk.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java (89%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/disk/StorageDiskRegistry.java (71%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/disk/StorageDiskSync.java (72%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/disk/factory/FluidStorageDiskFactory.java (77%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/disk/factory/ItemStorageDiskFactory.java (74%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorage.java (89%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageCache.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageProvider.java (65%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorage.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorageCache.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorageProvider.java (60%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/tracker/FluidStorageTracker.java (87%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/storage/tracker/ItemStorageTracker.java (87%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/util/Comparer.java (92%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/util/FluidFilter.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/util/FluidStackList.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/util/ItemFilter.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/util/ItemStackList.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/apiimpl/util/QuantityFormatter.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/BaseBlock.java (97%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/BlockDirection.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/BlockListener.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/CableBlock.java (96%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/ConstructorBlock.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/ControllerBlock.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/CrafterBlock.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/CrafterManagerBlock.java (80%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/CraftingMonitorBlock.java (78%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/DestructorBlock.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/DetectorBlock.java (87%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/DiskDriveBlock.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/DiskManipulatorBlock.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/ExporterBlock.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/ExternalStorageBlock.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/FluidInterfaceBlock.java (78%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/FluidStorageBlock.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/GridBlock.java (77%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/ImporterBlock.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/InterfaceBlock.java (78%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/MachineCasingBlock.java (58%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/NetworkNodeBlock.java (89%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/NetworkReceiverBlock.java (74%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/NetworkTransmitterBlock.java (80%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/PortableGridBlock.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/QuartzEnrichedIronBlock.java (60%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/RelayBlock.java (80%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/SecurityManagerBlock.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/StorageBlock.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/StorageMonitorBlock.java (84%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/block/WirelessTransmitterBlock.java (70%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/capability/NetworkNodeProxyCapability.java (89%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/command/CommandCreateDisk.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/command/PatternDumpCommand.java (96%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/config/ClientConfig.java (98%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/config/ServerConfig.java (99%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/AlternativesContainer.java (80%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/AmountContainer.java (82%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/BaseContainer.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/ConstructorContainer.java (74%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/ControllerContainer.java (65%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/CrafterContainer.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/CrafterManagerContainer.java (87%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/CraftingMonitorContainer.java (84%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/CraftingSettingsContainer.java (65%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/DestructorContainer.java (76%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/DetectorContainer.java (67%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/DiskDriveContainer.java (77%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/DiskManipulatorContainer.java (82%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/ExporterContainer.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/ExternalStorageContainer.java (72%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/FilterContainer.java (68%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/FluidAmountContainer.java (68%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/FluidInterfaceContainer.java (74%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/FluidStorageContainer.java (70%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/GridContainer.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/ImporterContainer.java (76%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/InterfaceContainer.java (80%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/NetworkTransmitterContainer.java (78%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/RelayContainer.java (64%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/SecurityManagerContainer.java (85%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/StorageContainer.java (69%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/StorageMonitorContainer.java (69%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/WirelessTransmitterContainer.java (79%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/factory/CrafterManagerContainerFactory.java (79%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/factory/CrafterManagerContainerProvider.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/factory/CraftingMonitorContainerFactory.java (71%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/factory/CraftingMonitorContainerProvider.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/factory/GridContainerFactory.java (79%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/factory/GridContainerProvider.java (77%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/factory/PositionalTileContainerFactory.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/factory/PositionalTileContainerProvider.java (95%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/factory/WirelessCraftingMonitorContainerFactory.java (73%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/slot/BaseSlot.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/slot/CrafterManagerSlot.java (78%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/slot/DisabledSlot.java (87%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/slot/OutputSlot.java (87%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/slot/filter/DisabledFluidFilterSlot.java (80%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/slot/filter/FilterSlot.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/slot/filter/FluidFilterSlot.java (84%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/slot/grid/CraftingGridSlot.java (82%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/slot/grid/ResultCraftingGridSlot.java (87%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/slot/legacy/LegacyBaseSlot.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/slot/legacy/LegacyDisabledSlot.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/slot/legacy/LegacyFilterSlot.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/transfer/FilterInventoryWrapper.java (80%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/transfer/FluidFilterInventoryWrapper.java (79%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/transfer/IInventoryWrapper.java (65%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/transfer/InsertionResult.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/transfer/InsertionResultType.java (52%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/transfer/InventoryInventoryWrapper.java (96%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/transfer/ItemFilterInventoryWrapper.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/transfer/ItemHandlerInventoryWrapper.java (94%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/container/transfer/TransferManager.java (95%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/energy/BaseEnergyStorage.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/energy/ItemEnergyStorage.java (96%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java (85%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/integration/inventorysorter/InventorySorterIntegration.java (74%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/integration/inventorytweaks/InventoryTweaksIntegration.java (73%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/integration/jei/GhostIngredientHandler.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/integration/jei/GridRecipeTransferHandler.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/integration/jei/GuiContainerHandler.java (77%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/integration/jei/JeiIntegration.java (75%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/integration/jei/RSJeiPlugin.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/inventory/fluid/FilterFluidInventory.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/inventory/fluid/FilterIconFluidInventory.java (85%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/inventory/fluid/FluidInventory.java (95%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/inventory/fluid/ProxyFluidHandler.java (96%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/inventory/item/BaseItemHandler.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/inventory/item/FilterIconItemHandler.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/inventory/item/FilterItemHandler.java (75%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/inventory/item/FilterItemsItemHandler.java (87%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/inventory/item/ProxyItemHandler.java (96%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/inventory/item/UpgradeItemHandler.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/inventory/item/validator/ItemValidator.java (84%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/inventory/item/validator/PatternItemValidator.java (77%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/inventory/item/validator/StorageDiskItemValidator.java (70%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/inventory/item/validator/UpgradeItemValidator.java (78%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/inventory/listener/InventoryListener.java (62%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/inventory/listener/NetworkNodeFluidInventoryListener.java (66%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/inventory/listener/NetworkNodeInventoryListener.java (65%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/inventory/listener/TileInventoryListener.java (75%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/CoreItem.java (79%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/EnergyItem.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/FilterItem.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/FluidStorageDiskItem.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/FluidStoragePartItem.java (82%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/NetworkCardItem.java (94%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/NetworkItem.java (94%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/PatternItem.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/ProcessorBindingItem.java (73%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/ProcessorItem.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/QuartzEnrichedIronItem.java (73%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/SecurityCardItem.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/SiliconItem.java (70%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/StorageDiskItem.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/StorageHousingItem.java (72%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/StoragePartItem.java (79%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/UpgradeItem.java (96%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/WirelessCraftingMonitorItem.java (87%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/WirelessFluidGridItem.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/WirelessGridItem.java (84%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/WrenchItem.java (78%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/blockitem/BaseBlockItem.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/blockitem/ControllerBlockItem.java (76%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/blockitem/EnergyBlockItem.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/blockitem/FluidStorageBlockItem.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/blockitem/PortableGridBlockItem.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/blockitem/StorageBlockItem.java (84%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/blockitem/WirelessTransmitterBlockItem.java (82%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/capabilityprovider/EnergyCapabilityProvider.java (89%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/item/group/MainItemGroup.java (67%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/loottable/ControllerLootFunction.java (84%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/loottable/ControllerLootFunctionSerializer.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/loottable/CrafterLootFunction.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/loottable/CrafterLootFunctionSerializer.java (89%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/loottable/PortableGridBlockLootFunction.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/loottable/PortableGridBlockLootFunctionSerializer.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/loottable/StorageBlockLootFunction.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/loottable/StorageBlockLootFunctionSerializer.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/ClientProxy.java (69%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/FilterUpdateMessage.java (89%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/FluidFilterSlotUpdateMessage.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/NetworkHandler.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/OpenNetworkItemMessage.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/SecurityManagerUpdateMessage.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/SetFilterSlotMessage.java (89%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/SetFluidFilterSlotMessage.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/craftingmonitor/CraftingMonitorCancelMessage.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/craftingmonitor/CraftingMonitorUpdateMessage.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/craftingmonitor/WirelessCraftingMonitorSettingsUpdateMessage.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/disk/StorageDiskSizeRequestMessage.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/disk/StorageDiskSizeResponseMessage.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/GridClearMessage.java (89%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/GridCraftingPreviewRequestMessage.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/GridCraftingPreviewResponseMessage.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/GridCraftingStartRequestMessage.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/GridCraftingStartResponseMessage.java (85%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/GridFluidDeltaMessage.java (80%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/GridFluidInsertHeldMessage.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/GridFluidPullMessage.java (89%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/GridFluidUpdateMessage.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/GridItemDeltaMessage.java (79%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/GridItemInsertHeldMessage.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/GridItemPullMessage.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/GridItemUpdateMessage.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/GridPatternCreateMessage.java (87%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/GridProcessingTransferMessage.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/GridTransferMessage.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/PortableGridFluidDeltaMessage.java (82%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/PortableGridFluidUpdateMessage.java (78%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/PortableGridItemDeltaMessage.java (82%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/PortableGridItemUpdateMessage.java (78%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/PortableGridSettingsUpdateMessage.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/WirelessFluidGridSettingsUpdateMessage.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/grid/WirelessGridSettingsUpdateMessage.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/tiledata/TileDataParameterMessage.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/network/tiledata/TileDataParameterUpdateMessage.java (87%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java (96%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/recipe/UpgradeWithEnchantedBookRecipeSerializer.java (97%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/render/BakedModelOverrideRegistry.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/render/FluidRenderer.java (99%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/render/RenderSettings.java (94%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/render/Styles.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/render/color/PatternItemColor.java (71%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/render/model/DelegateBakedModel.java (97%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/render/model/DiskDriveBakedModel.java (95%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/render/model/DiskManipulatorBakedModel.java (95%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/render/model/FullbrightBakedModel.java (98%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/render/model/PatternBakedModel.java (85%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/render/model/PortableGridBakedModel.java (95%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/render/model/PortableGridItemBakedModel.java (97%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/render/model/TRSRBakedModel.java (98%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/render/resourcepack/RSResourcePackSection.java (89%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/render/resourcepack/RSResourcePackSectionDeserializer.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/render/resourcepack/ResourcePackListener.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/render/tesr/PatternItemStackTileRenderer.java (79%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/render/tesr/StorageMonitorTileRenderer.java (95%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/AmountSpecifyingScreen.java (96%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/BaseScreen.java (94%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/ConstructorScreen.java (67%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/ControllerScreen.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/CrafterManagerScreen.java (87%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/CrafterScreen.java (80%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/CrafterTileDataParameterClientListener.java (63%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/CraftingMonitorScreen.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/DestructorScreen.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/DetectorScreen.java (79%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/DiskDriveScreen.java (84%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/DiskManipulatorScreen.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/EmptyScreenInfoProvider.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/ExporterScreen.java (75%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/ExternalStorageScreen.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/FilterScreen.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/FluidAmountScreen.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/FluidInterfaceScreen.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/FluidStorageBlockScreen.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/IScreenInfoProvider.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/ImporterScreen.java (68%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/InterfaceScreen.java (74%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/ItemAmountScreen.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/KeyInputListener.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/NetworkTransmitterScreen.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/PriorityScreen.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/RelayScreen.java (76%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/SecurityManagerScreen.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/StorageBlockScreen.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/StorageMonitorScreen.java (73%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/StorageScreen.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/WirelessTransmitterScreen.java (78%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/factory/CrafterManagerScreenFactory.java (75%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/factory/GridScreenFactory.java (74%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/AlternativesScreen.java (94%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/CraftingPreviewScreen.java (89%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/CraftingSettingsScreen.java (78%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/GridScreen.java (91%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/filtering/CraftableGridFilter.java (77%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/filtering/FilterGridFilter.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/filtering/GridFilterParser.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/filtering/ModGridFilter.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/filtering/NameGridFilter.java (72%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/filtering/OrGridFilter.java (83%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/filtering/TagGridFilter.java (74%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/filtering/TooltipGridFilter.java (82%) create mode 100644 src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/IGridSorter.java rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/sorting/IdGridSorter.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/sorting/InventoryTweaksGridSorter.java (87%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/sorting/LastModifiedGridSorter.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/sorting/NameGridSorter.java (77%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/sorting/QuantityGridSorter.java (79%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/sorting/SortingDirection.java (51%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/stack/FluidGridStack.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/stack/IGridStack.java (76%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/stack/ItemGridStack.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/view/BaseGridView.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/view/FluidGridView.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/view/IGridView.java (74%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/grid/view/ItemGridView.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/CheckboxWidget.java (97%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/ScrollbarWidget.java (89%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/ScrollbarWidgetListener.java (64%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/SearchWidget.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/TabListWidget.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java (70%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java (75%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/sidebutton/CrafterManagerSearchBoxModeSideButton.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java (75%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java (75%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java (77%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java (78%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/sidebutton/GridSearchBoxModeSideButton.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java (85%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java (74%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java (77%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/sidebutton/SideButton.java (82%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/sidebutton/TypeSideButton.java (72%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java (76%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/setup/ClientSetup.java (94%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/setup/CommonSetup.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/setup/ServerSetup.java (80%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/BaseTile.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/CableTile.java (69%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/ClientNode.java (91%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/ConstructorTile.java (74%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/ControllerTile.java (85%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/CrafterManagerTile.java (76%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/CrafterTile.java (84%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/DestructorTile.java (74%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/DetectorTile.java (84%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/DiskDriveTile.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/DiskManipulatorTile.java (85%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/ExporterTile.java (66%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/ExternalStorageTile.java (82%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/FluidInterfaceTile.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/FluidStorageTile.java (68%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/ImporterTile.java (67%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/InterfaceTile.java (80%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/NetworkNodeTile.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/NetworkReceiverTile.java (71%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/NetworkTransmitterTile.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/RelayTile.java (69%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/SecurityManagerTile.java (71%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/StorageMonitorTile.java (87%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/StorageTile.java (67%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/WirelessTransmitterTile.java (74%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/config/IAccessType.java (59%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/config/IComparable.java (70%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/config/IPrioritizable.java (71%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/config/IRedstoneConfigurable.java (70%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/config/IType.java (73%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/config/IWhitelistBlacklist.java (88%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/config/RedstoneMode.java (91%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/craftingmonitor/CraftingMonitorTile.java (81%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/craftingmonitor/ICraftingMonitor.java (75%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java (87%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/data/RSSerializers.java (95%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/data/TileDataManager.java (91%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/data/TileDataParameter.java (97%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/data/TileDataParameterClientListener.java (66%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/data/TileDataWatcher.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/grid/GridTile.java (90%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/grid/WirelessFluidGrid.java (87%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/grid/WirelessGrid.java (88%) mode change 100755 => 100644 rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/grid/portable/IPortableGrid.java (75%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/grid/portable/PortableGrid.java (82%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/grid/portable/PortableGridDiskState.java (93%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/tile/grid/portable/PortableGridTile.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/util/AccessTypeUtils.java (86%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/util/BlockUtils.java (78%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/util/CollisionUtils.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/util/DirectionUtils.java (92%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/util/FluidStorageBlockUtils.java (84%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/util/GridUtils.java (79%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/util/NetworkUtils.java (84%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/util/PacketBufferUtils.java (85%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/util/RenderUtils.java (98%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/util/StackUtils.java (95%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/util/StorageBlockUtils.java (82%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/util/TimeUtils.java (97%) rename src/main/java/com/{raoulvdberge => refinedmods}/refinedstorage/util/WorldUtils.java (97%) diff --git a/build.gradle b/build.gradle index fb706cca3..f3ad28323 100755 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ def env = System.getenv() if (env.BUILD_NUMBER) { version = version + "+" + "${env.BUILD_NUMBER}" } -group = 'com.raoulvdberge' +group = 'com.refinedmods' archivesBaseName = 'refinedstorage' sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' @@ -108,11 +108,11 @@ jar { manifest { attributes([ "Specification-Title" : "refinedstorage", - "Specification-Vendor" : "raoulvdberge", + "Specification-Vendor" : "refinedmods", "Specification-Version" : "1", "Implementation-Title" : project.name, "Implementation-Version" : "${version}", - "Implementation-Vendor" : "raoulvdberge", + "Implementation-Vendor" : "refinedmods", "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) } @@ -123,7 +123,7 @@ jar.finalizedBy('reobfJar') task apiJar(type: Jar, dependsOn: 'classes') { classifier = 'api' from(sourceSets.main.output) { - include 'com/raoulvdberge/refinedstorage/api/**' + include 'com/refinedmods/refinedstorage/api/**' } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskFactory.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskFactory.java deleted file mode 100644 index f973a3ec5..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskFactory.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5; - -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskFactory; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.ResourceLocation; - -import javax.annotation.Nonnull; - -public class CraftingTaskFactory implements ICraftingTaskFactory { - public static final ResourceLocation ID = new ResourceLocation(RS.ID, "v5"); - - @Nonnull - @Override - public ICraftingTask create(INetwork network, ICraftingRequestInfo requested, int quantity, ICraftingPattern pattern) { - return new com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5.CraftingTask(network, requested, quantity, pattern); - } - - @Override - public ICraftingTask createFromNbt(INetwork network, CompoundNBT tag) throws CraftingTaskReadException { - return new com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5.CraftingTask(network, tag); - } -} \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTaskFactory.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTaskFactory.java deleted file mode 100644 index 2b1c343f9..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTaskFactory.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6; - -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskFactory; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.ResourceLocation; - -import javax.annotation.Nonnull; - -public class CraftingTaskFactory implements ICraftingTaskFactory { - public static final ResourceLocation ID = new ResourceLocation(RS.ID, "v6"); - - @Nonnull - @Override - public ICraftingTask create(INetwork network, ICraftingRequestInfo requested, int quantity, ICraftingPattern pattern) { - return new com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6.CraftingTask(network, requested, quantity, pattern); - } - - @Override - public ICraftingTask createFromNbt(INetwork network, CompoundNBT tag) throws CraftingTaskReadException { - return new com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6.CraftingTask(network, tag); - } -} \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/IGridSorter.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/IGridSorter.java deleted file mode 100644 index f5d3356b5..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/IGridSorter.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.raoulvdberge.refinedstorage.screen.grid.sorting; - -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; - -public interface IGridSorter { - boolean isApplicable(IGrid grid); - - int compare(IGridStack left, IGridStack right, SortingDirection direction); -} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RS.java b/src/main/java/com/refinedmods/refinedstorage/RS.java old mode 100755 new mode 100644 similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/RS.java rename to src/main/java/com/refinedmods/refinedstorage/RS.java index d5498c103..77bc33996 --- a/src/main/java/com/raoulvdberge/refinedstorage/RS.java +++ b/src/main/java/com/refinedmods/refinedstorage/RS.java @@ -1,13 +1,13 @@ -package com.raoulvdberge.refinedstorage; +package com.refinedmods.refinedstorage; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.config.ClientConfig; -import com.raoulvdberge.refinedstorage.config.ServerConfig; -import com.raoulvdberge.refinedstorage.item.group.MainItemGroup; -import com.raoulvdberge.refinedstorage.network.NetworkHandler; -import com.raoulvdberge.refinedstorage.setup.ClientSetup; -import com.raoulvdberge.refinedstorage.setup.CommonSetup; -import com.raoulvdberge.refinedstorage.setup.ServerSetup; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.config.ClientConfig; +import com.refinedmods.refinedstorage.config.ServerConfig; +import com.refinedmods.refinedstorage.item.group.MainItemGroup; +import com.refinedmods.refinedstorage.network.NetworkHandler; +import com.refinedmods.refinedstorage.setup.ClientSetup; +import com.refinedmods.refinedstorage.setup.CommonSetup; +import com.refinedmods.refinedstorage.setup.ServerSetup; import net.minecraft.block.Block; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.Item; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSBlocks.java b/src/main/java/com/refinedmods/refinedstorage/RSBlocks.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/com/raoulvdberge/refinedstorage/RSBlocks.java rename to src/main/java/com/refinedmods/refinedstorage/RSBlocks.java index a420c101e..a71987423 --- a/src/main/java/com/raoulvdberge/refinedstorage/RSBlocks.java +++ b/src/main/java/com/refinedmods/refinedstorage/RSBlocks.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage; +package com.refinedmods.refinedstorage; -import com.raoulvdberge.refinedstorage.block.*; +import com.refinedmods.refinedstorage.block.*; import net.minecraftforge.registries.ObjectHolder; public final class RSBlocks { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSContainers.java b/src/main/java/com/refinedmods/refinedstorage/RSContainers.java similarity index 97% rename from src/main/java/com/raoulvdberge/refinedstorage/RSContainers.java rename to src/main/java/com/refinedmods/refinedstorage/RSContainers.java index ae9b2fcdd..31801cb27 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/RSContainers.java +++ b/src/main/java/com/refinedmods/refinedstorage/RSContainers.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage; +package com.refinedmods.refinedstorage; -import com.raoulvdberge.refinedstorage.container.*; +import com.refinedmods.refinedstorage.container.*; import net.minecraft.inventory.container.ContainerType; import net.minecraftforge.registries.ObjectHolder; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSItems.java b/src/main/java/com/refinedmods/refinedstorage/RSItems.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/com/raoulvdberge/refinedstorage/RSItems.java rename to src/main/java/com/refinedmods/refinedstorage/RSItems.java index 6ff9c2ae8..76b23c336 --- a/src/main/java/com/raoulvdberge/refinedstorage/RSItems.java +++ b/src/main/java/com/refinedmods/refinedstorage/RSItems.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage; +package com.refinedmods.refinedstorage; -import com.raoulvdberge.refinedstorage.item.*; -import com.raoulvdberge.refinedstorage.item.blockitem.PortableGridBlockItem; +import com.refinedmods.refinedstorage.item.*; +import com.refinedmods.refinedstorage.item.blockitem.PortableGridBlockItem; import net.minecraftforge.registries.ObjectHolder; public final class RSItems { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSKeyBindings.java b/src/main/java/com/refinedmods/refinedstorage/RSKeyBindings.java similarity index 97% rename from src/main/java/com/raoulvdberge/refinedstorage/RSKeyBindings.java rename to src/main/java/com/refinedmods/refinedstorage/RSKeyBindings.java index d5ea6030e..0a1cdc659 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/RSKeyBindings.java +++ b/src/main/java/com/refinedmods/refinedstorage/RSKeyBindings.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage; +package com.refinedmods.refinedstorage; import net.minecraft.client.settings.KeyBinding; import net.minecraft.client.util.InputMappings; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSTiles.java b/src/main/java/com/refinedmods/refinedstorage/RSTiles.java similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/RSTiles.java rename to src/main/java/com/refinedmods/refinedstorage/RSTiles.java index 3af3c389a..06ee1ae4c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/RSTiles.java +++ b/src/main/java/com/refinedmods/refinedstorage/RSTiles.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage; +package com.refinedmods.refinedstorage; -import com.raoulvdberge.refinedstorage.tile.*; -import com.raoulvdberge.refinedstorage.tile.craftingmonitor.CraftingMonitorTile; -import com.raoulvdberge.refinedstorage.tile.grid.GridTile; -import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGridTile; +import com.refinedmods.refinedstorage.tile.*; +import com.refinedmods.refinedstorage.tile.craftingmonitor.CraftingMonitorTile; +import com.refinedmods.refinedstorage.tile.grid.GridTile; +import com.refinedmods.refinedstorage.tile.grid.portable.PortableGridTile; import net.minecraft.tileentity.TileEntityType; import net.minecraftforge.registries.ObjectHolder; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java b/src/main/java/com/refinedmods/refinedstorage/api/IRSAPI.java old mode 100755 new mode 100644 similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java rename to src/main/java/com/refinedmods/refinedstorage/api/IRSAPI.java index 132f0ac65..d1d1c1521 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/IRSAPI.java @@ -1,27 +1,27 @@ -package com.raoulvdberge.refinedstorage.api; +package com.refinedmods.refinedstorage.api; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternRenderHandler; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementList; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry; -import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskRegistry; -import com.raoulvdberge.refinedstorage.api.network.INetworkManager; -import com.raoulvdberge.refinedstorage.api.network.grid.ICraftingGridBehavior; -import com.raoulvdberge.refinedstorage.api.network.grid.IGridManager; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeManager; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeRegistry; -import com.raoulvdberge.refinedstorage.api.storage.StorageType; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskManager; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskRegistry; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskSync; -import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStorageProvider; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.api.util.IQuantityFormatter; -import com.raoulvdberge.refinedstorage.api.util.IStackList; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternRenderHandler; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementList; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry; +import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry; +import com.refinedmods.refinedstorage.api.autocrafting.task.CraftingTaskReadException; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskRegistry; +import com.refinedmods.refinedstorage.api.network.INetworkManager; +import com.refinedmods.refinedstorage.api.network.grid.ICraftingGridBehavior; +import com.refinedmods.refinedstorage.api.network.grid.IGridManager; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.network.node.INetworkNodeManager; +import com.refinedmods.refinedstorage.api.network.node.INetworkNodeRegistry; +import com.refinedmods.refinedstorage.api.storage.StorageType; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskManager; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskRegistry; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskSync; +import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageProvider; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.api.util.IQuantityFormatter; +import com.refinedmods.refinedstorage.api.util.IStackList; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.server.ServerWorld; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/RSAPIInject.java b/src/main/java/com/refinedmods/refinedstorage/api/RSAPIInject.java old mode 100755 new mode 100644 similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/api/RSAPIInject.java rename to src/main/java/com/refinedmods/refinedstorage/api/RSAPIInject.java index da3d630ff..f96b10073 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/RSAPIInject.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/RSAPIInject.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api; +package com.refinedmods.refinedstorage.api; import java.lang.annotation.ElementType; import java.lang.annotation.Target; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingManager.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingManager.java similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingManager.java rename to src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingManager.java index 1ca850dc2..a97603ce6 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingManager.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting; +package com.refinedmods.refinedstorage.api.autocrafting; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorListener; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorListener; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTask; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPattern.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPattern.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPattern.java rename to src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPattern.java index 30b85bf08..665185ec1 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPattern.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPattern.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting; +package com.refinedmods.refinedstorage.api.autocrafting; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskRegistry; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskRegistry; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternChain.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternChain.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternChain.java rename to src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternChain.java index f92b11d09..09d9c1d1a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternChain.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternChain.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting; +package com.refinedmods.refinedstorage.api.autocrafting; /** * A crafting pattern chain, which stores equivalent patterns. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternChainList.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternChainList.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternChainList.java rename to src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternChainList.java index cbb34908f..b18b0d040 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternChainList.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternChainList.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting; +package com.refinedmods.refinedstorage.api.autocrafting; /** * A list of pattern chains per pattern. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternContainer.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternContainer.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternContainer.java rename to src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternContainer.java index b835ab720..2ebffa2ed --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternContainer.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting; +package com.refinedmods.refinedstorage.api.autocrafting; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternProvider.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternProvider.java old mode 100755 new mode 100644 similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternProvider.java rename to src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternProvider.java index 852af9c2f..a6b223bed --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternProvider.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting; +package com.refinedmods.refinedstorage.api.autocrafting; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternRenderHandler.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternRenderHandler.java similarity index 69% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternRenderHandler.java rename to src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternRenderHandler.java index d79a3026b..6757f2b99 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternRenderHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternRenderHandler.java @@ -1,10 +1,11 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting; +package com.refinedmods.refinedstorage.api.autocrafting; +import com.refinedmods.refinedstorage.api.IRSAPI; import net.minecraft.item.ItemStack; /** * Defines the behavior of pattern rendering. - * One can add this interface through {@link com.raoulvdberge.refinedstorage.api.IRSAPI#addPatternRenderHandler(ICraftingPatternRenderHandler)}. + * One can add this interface through {@link IRSAPI#addPatternRenderHandler(ICraftingPatternRenderHandler)}. */ public interface ICraftingPatternRenderHandler { /** diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java old mode 100755 new mode 100644 similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java rename to src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java index 3b65e806b..9b7a3c147 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor; +package com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor; -import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementList; +import com.refinedmods.refinedstorage.api.render.IElementDrawers; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementList; import net.minecraft.network.PacketBuffer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementList.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementList.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementList.java rename to src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementList.java index e5db22a94..3765ded09 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementList.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementList.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor; +package com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor; import java.util.List; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementRegistry.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementRegistry.java old mode 100755 new mode 100644 similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementRegistry.java rename to src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementRegistry.java index 03760227a..e818768ee --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementRegistry.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementRegistry.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor; +package com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor; import net.minecraft.network.PacketBuffer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorListener.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorListener.java similarity index 69% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorListener.java rename to src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorListener.java index 80e73851d..328758177 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorListener.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor; +package com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingManager; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingManager; /** * Add this listener to a {@link ICraftingManager} to listen to crafting task changes. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java old mode 100755 new mode 100644 similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java rename to src/main/java/com/refinedmods/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java index 6d4968748..b81fb2351 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting.preview; +package com.refinedmods.refinedstorage.api.autocrafting.preview; -import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; +import com.refinedmods.refinedstorage.api.render.IElementDrawers; import net.minecraft.network.PacketBuffer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/preview/ICraftingPreviewElementRegistry.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/preview/ICraftingPreviewElementRegistry.java old mode 100755 new mode 100644 similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/preview/ICraftingPreviewElementRegistry.java rename to src/main/java/com/refinedmods/refinedstorage/api/autocrafting/preview/ICraftingPreviewElementRegistry.java index ad524f147..bcc3a5923 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/preview/ICraftingPreviewElementRegistry.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/preview/ICraftingPreviewElementRegistry.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting.preview; +package com.refinedmods.refinedstorage.api.autocrafting.preview; import net.minecraft.network.PacketBuffer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/CraftingTaskErrorType.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/CraftingTaskErrorType.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/CraftingTaskErrorType.java rename to src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/CraftingTaskErrorType.java index 29f3ae705..f1f351e9d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/CraftingTaskErrorType.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/CraftingTaskErrorType.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting.task; +package com.refinedmods.refinedstorage.api.autocrafting.task; /** * The error type. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/CraftingTaskReadException.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/CraftingTaskReadException.java similarity index 71% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/CraftingTaskReadException.java rename to src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/CraftingTaskReadException.java index 4ef1f66b3..f07c60dc1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/CraftingTaskReadException.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/CraftingTaskReadException.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting.task; +package com.refinedmods.refinedstorage.api.autocrafting.task; -import com.raoulvdberge.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.INetwork; /** * Gets thrown from {@link ICraftingTaskFactory#createFromNbt(INetwork, net.minecraft.nbt.CompoundNBT)}. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingRequestInfo.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingRequestInfo.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingRequestInfo.java rename to src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingRequestInfo.java index 892ebec1f..fcde52801 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingRequestInfo.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingRequestInfo.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting.task; +package com.refinedmods.refinedstorage.api.autocrafting.task; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTask.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingTask.java old mode 100755 new mode 100644 similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTask.java rename to src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingTask.java index d9b9dd9b5..a630218ac --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTask.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingTask.java @@ -1,9 +1,10 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting.task; +package com.refinedmods.refinedstorage.api.autocrafting.task; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; -import com.raoulvdberge.refinedstorage.api.util.IStackList; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; +import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.util.IStackList; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.fluids.FluidStack; @@ -55,14 +56,14 @@ public interface ICraftingTask { ICraftingRequestInfo getRequested(); /** - * Called when a stack is inserted into the system through {@link com.raoulvdberge.refinedstorage.api.network.INetwork#insertItemTracked(ItemStack, int)}. + * Called when a stack is inserted into the system through {@link INetwork#insertItemTracked(ItemStack, int)}. * * @param stack the stack */ int onTrackedInsert(ItemStack stack, int size); /** - * Called when a stack is inserted into the system through {@link com.raoulvdberge.refinedstorage.api.network.INetwork#insertFluidTracked(FluidStack, int)}. + * Called when a stack is inserted into the system through {@link INetwork#insertFluidTracked(FluidStack, int)}. * * @param stack the stack */ diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTaskError.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingTaskError.java similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTaskError.java rename to src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingTaskError.java index d9e35f9da..440c94885 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTaskError.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingTaskError.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting.task; +package com.refinedmods.refinedstorage.api.autocrafting.task; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; import javax.annotation.Nullable; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTaskFactory.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingTaskFactory.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTaskFactory.java rename to src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingTaskFactory.java index 038d8f366..bba1cc291 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTaskFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingTaskFactory.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting.task; +package com.refinedmods.refinedstorage.api.autocrafting.task; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; +import com.refinedmods.refinedstorage.api.network.INetwork; import net.minecraft.nbt.CompoundNBT; import javax.annotation.Nonnull; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTaskRegistry.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingTaskRegistry.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTaskRegistry.java rename to src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingTaskRegistry.java index fc8da1d75..bd7e36110 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTaskRegistry.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingTaskRegistry.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting.task; +package com.refinedmods.refinedstorage.api.autocrafting.task; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetwork.java b/src/main/java/com/refinedmods/refinedstorage/api/network/INetwork.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/INetwork.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/INetwork.java index 2f69a7bca..155da0f95 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetwork.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/INetwork.java @@ -1,15 +1,15 @@ -package com.raoulvdberge.refinedstorage.api.network; +package com.refinedmods.refinedstorage.api.network; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingManager; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IFluidGridHandler; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler; -import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemManager; -import com.raoulvdberge.refinedstorage.api.network.security.ISecurityManager; -import com.raoulvdberge.refinedstorage.api.storage.IStorage; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.tracker.IStorageTracker; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingManager; +import com.refinedmods.refinedstorage.api.network.grid.handler.IFluidGridHandler; +import com.refinedmods.refinedstorage.api.network.grid.handler.IItemGridHandler; +import com.refinedmods.refinedstorage.api.network.item.INetworkItemManager; +import com.refinedmods.refinedstorage.api.network.security.ISecurityManager; +import com.refinedmods.refinedstorage.api.storage.IStorage; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCache; +import com.refinedmods.refinedstorage.api.storage.tracker.IStorageTracker; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.api.util.IComparer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.BlockPos; @@ -85,7 +85,7 @@ public interface INetwork { INetworkItemManager getNetworkItemManager(); /** - * @return the {@link IStorageCache} of this network + * @return the {@link IStorageCache } of this network */ IStorageCache getItemStorageCache(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkManager.java b/src/main/java/com/refinedmods/refinedstorage/api/network/INetworkManager.java similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkManager.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/INetworkManager.java index 1a89d4331..c32100963 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/INetworkManager.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.network; +package com.refinedmods.refinedstorage.api.network; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNodeGraph.java b/src/main/java/com/refinedmods/refinedstorage/api/network/INetworkNodeGraph.java old mode 100755 new mode 100644 similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNodeGraph.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/INetworkNodeGraph.java index 894ab3ea8..d4641b848 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNodeGraph.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/INetworkNodeGraph.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.api.network; +package com.refinedmods.refinedstorage.api.network; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.util.Action; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNodeGraphListener.java b/src/main/java/com/refinedmods/refinedstorage/api/network/INetworkNodeGraphListener.java similarity index 75% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNodeGraphListener.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/INetworkNodeGraphListener.java index b468999df..fb6d087f2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNodeGraphListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/INetworkNodeGraphListener.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.network; +package com.refinedmods.refinedstorage.api.network; /** * A listener for the node graph. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNodeVisitor.java b/src/main/java/com/refinedmods/refinedstorage/api/network/INetworkNodeVisitor.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNodeVisitor.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/INetworkNodeVisitor.java index 08bb18797..2497c6a05 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNodeVisitor.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/INetworkNodeVisitor.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.api.network; +package com.refinedmods.refinedstorage.api.network; -import com.raoulvdberge.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.api.util.Action; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/IWirelessTransmitter.java b/src/main/java/com/refinedmods/refinedstorage/api/network/IWirelessTransmitter.java old mode 100755 new mode 100644 similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/IWirelessTransmitter.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/IWirelessTransmitter.java index f14beb18b..aea96639f --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/IWirelessTransmitter.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/IWirelessTransmitter.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.network; +package com.refinedmods.refinedstorage.api.network; import net.minecraft.util.math.BlockPos; import net.minecraft.world.dimension.DimensionType; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/NetworkType.java b/src/main/java/com/refinedmods/refinedstorage/api/network/NetworkType.java similarity index 76% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/NetworkType.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/NetworkType.java index 8852721b1..088577c99 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/NetworkType.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/NetworkType.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.network; +package com.refinedmods.refinedstorage.api.network; /** * Represents a network type. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/GridFactoryType.java b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/GridFactoryType.java similarity index 78% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/GridFactoryType.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/grid/GridFactoryType.java index 889f0fff1..3dbfc96b2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/GridFactoryType.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/GridFactoryType.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.network.grid; +package com.refinedmods.refinedstorage.api.network.grid; /** * The type of grid factory. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/GridType.java b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/GridType.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/GridType.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/grid/GridType.java index 17290e7e3..fc180342a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/GridType.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/GridType.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.network.grid; +package com.refinedmods.refinedstorage.api.network.grid; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/ICraftingGridBehavior.java b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/ICraftingGridBehavior.java similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/ICraftingGridBehavior.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/grid/ICraftingGridBehavior.java index f581fe748..8709c83f7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/ICraftingGridBehavior.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/ICraftingGridBehavior.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.network.grid; +package com.refinedmods.refinedstorage.api.network.grid; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/ICraftingGridListener.java b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/ICraftingGridListener.java similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/ICraftingGridListener.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/grid/ICraftingGridListener.java index 8913bbae3..d060a1b73 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/ICraftingGridListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/ICraftingGridListener.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.network.grid; +package com.refinedmods.refinedstorage.api.network.grid; /** * A crafting listener for the grid. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGrid.java b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGrid.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGrid.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGrid.java index 54fddf74f..b8f809a8a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGrid.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGrid.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.api.network.grid; +package com.refinedmods.refinedstorage.api.network.grid; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IFluidGridHandler; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; -import com.raoulvdberge.refinedstorage.api.util.IFilter; +import com.refinedmods.refinedstorage.api.network.grid.handler.IFluidGridHandler; +import com.refinedmods.refinedstorage.api.network.grid.handler.IItemGridHandler; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCache; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCacheListener; +import com.refinedmods.refinedstorage.api.util.IFilter; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.CraftResultInventory; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGridFactory.java b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridFactory.java similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGridFactory.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridFactory.java index e47640219..20b01e4cc 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGridFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridFactory.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.network.grid; +package com.refinedmods.refinedstorage.api.network.grid; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGridManager.java b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridManager.java similarity index 97% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGridManager.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridManager.java index d039622ee..fa64bf9ce 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGridManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridManager.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.network.grid; +package com.refinedmods.refinedstorage.api.network.grid; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGridTab.java b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridTab.java similarity index 84% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGridTab.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridTab.java index fa5455e12..92e9aa759 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGridTab.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridTab.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.api.network.grid; +package com.refinedmods.refinedstorage.api.network.grid; -import com.raoulvdberge.refinedstorage.api.render.IElementDrawer; -import com.raoulvdberge.refinedstorage.api.util.IFilter; +import com.refinedmods.refinedstorage.api.render.IElementDrawer; +import com.refinedmods.refinedstorage.api.util.IFilter; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/INetworkAwareGrid.java b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/INetworkAwareGrid.java similarity index 68% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/INetworkAwareGrid.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/grid/INetworkAwareGrid.java index 48f362af9..3e33db8c6 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/INetworkAwareGrid.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/INetworkAwareGrid.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.api.network.grid; +package com.refinedmods.refinedstorage.api.network.grid; -import com.raoulvdberge.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.INetwork; import javax.annotation.Nullable; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/handler/IFluidGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/handler/IFluidGridHandler.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/handler/IFluidGridHandler.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/grid/handler/IFluidGridHandler.java index c6cbca398..134286428 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/handler/IFluidGridHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/handler/IFluidGridHandler.java @@ -1,5 +1,6 @@ -package com.raoulvdberge.refinedstorage.api.network.grid.handler; +package com.refinedmods.refinedstorage.api.network.grid.handler; +import com.refinedmods.refinedstorage.api.util.StackListEntry; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; @@ -14,7 +15,7 @@ public interface IFluidGridHandler { * Called when a player tries to extract a fluid from the grid. * * @param player the player that is attempting the extraction - * @param id the id of the fluid we're trying to extract, this id is the id from {@link com.raoulvdberge.refinedstorage.api.util.StackListEntry} + * @param id the id of the fluid we're trying to extract, this id is the id from {@link StackListEntry} * @param shift true if shift click was used, false otherwise */ void onExtract(ServerPlayerEntity player, UUID id, boolean shift); @@ -40,7 +41,7 @@ public interface IFluidGridHandler { * Called when a player requests the crafting preview window to be opened. * * @param player the player - * @param id the id of the fluid we're trying to extract, this id is the id from {@link com.raoulvdberge.refinedstorage.api.util.StackListEntry} + * @param id the id of the fluid we're trying to extract, this id is the id from {@link StackListEntry} * @param quantity the amount of that item that we need a preview for * @param noPreview true if the crafting preview window shouldn't be shown, false otherwise */ @@ -50,7 +51,7 @@ public interface IFluidGridHandler { * Called when a player requested crafting for an item. * * @param player the player that is requesting the crafting - * @param id the id of the fluid we're trying to extract, this id is the id from {@link com.raoulvdberge.refinedstorage.api.util.StackListEntry} + * @param id the id of the fluid we're trying to extract, this id is the id from {@link StackListEntry} * @param quantity the amount of the item that has to be crafted */ void onCraftingRequested(ServerPlayerEntity player, UUID id, int quantity); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/handler/IItemGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/handler/IItemGridHandler.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/handler/IItemGridHandler.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/grid/handler/IItemGridHandler.java index d77f5c0e2..685dcf50f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/handler/IItemGridHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/handler/IItemGridHandler.java @@ -1,5 +1,6 @@ -package com.raoulvdberge.refinedstorage.api.network.grid.handler; +package com.refinedmods.refinedstorage.api.network.grid.handler; +import com.refinedmods.refinedstorage.api.util.StackListEntry; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; @@ -19,7 +20,7 @@ public interface IItemGridHandler { * Called when a player tries to extract an item from the grid. * * @param player the player that is attempting the extraction - * @param id the id of the item we're trying to extract, this id is the id from {@link com.raoulvdberge.refinedstorage.api.util.StackListEntry} + * @param id the id of the item we're trying to extract, this id is the id from {@link StackListEntry} * @param flags how we are extracting, see the flags in {@link IItemGridHandler} */ void onExtract(ServerPlayerEntity player, UUID id, int flags); @@ -46,7 +47,7 @@ public interface IItemGridHandler { * Called when a player requests the crafting preview window to be opened. * * @param player the player - * @param id the id of the item we're trying to extract, this id is the id from {@link com.raoulvdberge.refinedstorage.api.util.StackListEntry} + * @param id the id of the item we're trying to extract, this id is the id from {@link StackListEntry} * @param quantity the amount of that item that we need a preview for * @param noPreview true if the crafting preview window shouldn't be shown, false otherwise */ @@ -56,7 +57,7 @@ public interface IItemGridHandler { * Called when a player requested crafting for an item. * * @param player the player that is requesting the crafting - * @param id the id of the item we're trying to extract, this id is the id from {@link com.raoulvdberge.refinedstorage.api.util.StackListEntry} + * @param id the id of the item we're trying to extract, this id is the id from {@link StackListEntry} * @param quantity the amount of the item that has to be crafted */ void onCraftingRequested(ServerPlayerEntity player, UUID id, int quantity); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/item/INetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/api/network/item/INetworkItem.java old mode 100755 new mode 100644 similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/item/INetworkItem.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/item/INetworkItem.java index f92e6edfe..bde54c423 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/item/INetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/item/INetworkItem.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.api.network.item; +package com.refinedmods.refinedstorage.api.network.item; -import com.raoulvdberge.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.INetwork; import net.minecraft.entity.player.PlayerEntity; /** diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/item/INetworkItemManager.java b/src/main/java/com/refinedmods/refinedstorage/api/network/item/INetworkItemManager.java similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/item/INetworkItemManager.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/item/INetworkItemManager.java index c1092c012..ed083acf9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/item/INetworkItemManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/item/INetworkItemManager.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.network.item; +package com.refinedmods.refinedstorage.api.network.item; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/item/INetworkItemProvider.java b/src/main/java/com/refinedmods/refinedstorage/api/network/item/INetworkItemProvider.java old mode 100755 new mode 100644 similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/item/INetworkItemProvider.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/item/INetworkItemProvider.java index 7137539b1..6b7aa23ef --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/item/INetworkItemProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/item/INetworkItemProvider.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.network.item; +package com.refinedmods.refinedstorage.api.network.item; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/node/INetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNode.java similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/node/INetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNode.java index 4110c2510..d1b71dc12 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/node/INetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNode.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.api.network.node; +package com.refinedmods.refinedstorage.api.network.node; -import com.raoulvdberge.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.INetwork; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/node/INetworkNodeFactory.java b/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeFactory.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/node/INetworkNodeFactory.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeFactory.java index 12ad93d60..8ff7dd83c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/node/INetworkNodeFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeFactory.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.network.node; +package com.refinedmods.refinedstorage.api.network.node; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/node/INetworkNodeManager.java b/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeManager.java similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/node/INetworkNodeManager.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeManager.java index ee7b7b361..715bed5d4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/node/INetworkNodeManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeManager.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.network.node; +package com.refinedmods.refinedstorage.api.network.node; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/node/INetworkNodeProxy.java b/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeProxy.java similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/node/INetworkNodeProxy.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeProxy.java index ce0e5a8dd..62fa093a0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/node/INetworkNodeProxy.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeProxy.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.network.node; +package com.refinedmods.refinedstorage.api.network.node; import javax.annotation.Nonnull; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/node/INetworkNodeRegistry.java b/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeRegistry.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/node/INetworkNodeRegistry.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeRegistry.java index ce0eac1d8..2fd561114 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/node/INetworkNodeRegistry.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeRegistry.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.network.node; +package com.refinedmods.refinedstorage.api.network.node; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/security/ISecurityCard.java b/src/main/java/com/refinedmods/refinedstorage/api/network/security/ISecurityCard.java old mode 100755 new mode 100644 similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/security/ISecurityCard.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/security/ISecurityCard.java index 921bf3dcf..05047b4c4 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/security/ISecurityCard.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/security/ISecurityCard.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.network.security; +package com.refinedmods.refinedstorage.api.network.security; import javax.annotation.Nullable; import java.util.UUID; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/security/ISecurityCardContainer.java b/src/main/java/com/refinedmods/refinedstorage/api/network/security/ISecurityCardContainer.java old mode 100755 new mode 100644 similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/security/ISecurityCardContainer.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/security/ISecurityCardContainer.java index 12b9b86a4..6c503e6fb --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/security/ISecurityCardContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/security/ISecurityCardContainer.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.network.security; +package com.refinedmods.refinedstorage.api.network.security; import javax.annotation.Nullable; import java.util.List; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/security/ISecurityManager.java b/src/main/java/com/refinedmods/refinedstorage/api/network/security/ISecurityManager.java old mode 100755 new mode 100644 similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/security/ISecurityManager.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/security/ISecurityManager.java index ac037e27e..b202833e3 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/security/ISecurityManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/security/ISecurityManager.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.network.security; +package com.refinedmods.refinedstorage.api.network.security; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/security/Permission.java b/src/main/java/com/refinedmods/refinedstorage/api/network/security/Permission.java old mode 100755 new mode 100644 similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/security/Permission.java rename to src/main/java/com/refinedmods/refinedstorage/api/network/security/Permission.java index 32930d24f..1b860fd0a --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/security/Permission.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/security/Permission.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.network.security; +package com.refinedmods.refinedstorage.api.network.security; /** * The various permissions a player can have in a network. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/render/IElementDrawer.java b/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawer.java old mode 100755 new mode 100644 similarity index 75% rename from src/main/java/com/raoulvdberge/refinedstorage/api/render/IElementDrawer.java rename to src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawer.java index 58684c802..0b4dddfe2 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/render/IElementDrawer.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawer.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.api.render; +package com.refinedmods.refinedstorage.api.render; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; +import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; /** * This {@link FunctionalInterface} is used to define a draw/render function. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/render/IElementDrawers.java b/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawers.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/api/render/IElementDrawers.java rename to src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawers.java index 293b610fd..00758fc6e --- a/src/main/java/com/raoulvdberge/refinedstorage/api/render/IElementDrawers.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawers.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.render; +package com.refinedmods.refinedstorage.api.render; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/AccessType.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/AccessType.java old mode 100755 new mode 100644 similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/AccessType.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/AccessType.java index 66f631a9d..062761239 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/AccessType.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/AccessType.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.storage; +package com.refinedmods.refinedstorage.api.storage; /** * The access type of a storage. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorage.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/IStorage.java old mode 100755 new mode 100644 similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorage.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/IStorage.java index 5696a0f72..4cb4d26f4 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorage.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/IStorage.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.api.storage; +package com.refinedmods.refinedstorage.api.storage; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.api.util.IComparer; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorageProvider.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/IStorageProvider.java old mode 100755 new mode 100644 similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorageProvider.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/IStorageProvider.java index b5557f38e..ce8cf7238 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorageProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/IStorageProvider.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.storage; +package com.refinedmods.refinedstorage.api.storage; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/StorageType.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/StorageType.java similarity index 59% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/StorageType.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/StorageType.java index c9c5200ba..23b8ed280 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/StorageType.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/StorageType.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.storage; +package com.refinedmods.refinedstorage.api.storage; /** * The storage type. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/cache/IStorageCache.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/cache/IStorageCache.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/cache/IStorageCache.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/cache/IStorageCache.java index be7bd4b4b..47a7a45da 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/cache/IStorageCache.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/cache/IStorageCache.java @@ -1,9 +1,10 @@ -package com.raoulvdberge.refinedstorage.api.storage.cache; +package com.refinedmods.refinedstorage.api.storage.cache; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.storage.IStorage; -import com.raoulvdberge.refinedstorage.api.storage.IStorageProvider; -import com.raoulvdberge.refinedstorage.api.util.IStackList; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.storage.IStorage; +import com.refinedmods.refinedstorage.api.storage.IStorageProvider; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.api.util.IStackList; import javax.annotation.Nonnull; import java.util.List; @@ -29,7 +30,7 @@ public interface IStorageCache { * Adds a stack to the cache. *

* Note that this doesn't modify any of the connected storages, but just modifies the cache. - * Use {@link IStorage#insert(T, int, com.raoulvdberge.refinedstorage.api.util.Action)} to add a stack to an actual storage. + * Use {@link IStorage#insert(T, int, Action)} to add a stack to an actual storage. *

* Will merge it with another stack if it already exists. * @@ -44,7 +45,7 @@ public interface IStorageCache { * Removes a stack from the cache. *

* Note that this doesn't modify any of the connected storages, but just modifies the cache. - * Use {@link IStorage#extract(T, int, int, com.raoulvdberge.refinedstorage.api.util.Action)} to remove a stack from an actual storage. + * Use {@link IStorage#extract(T, int, int, Action)} to remove a stack from an actual storage. * * @param stack the stack to remove, do NOT modify * @param size the size to remove diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/cache/IStorageCacheListener.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/cache/IStorageCacheListener.java similarity index 84% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/cache/IStorageCacheListener.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/cache/IStorageCacheListener.java index 474185de9..ecd6459eb 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/cache/IStorageCacheListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/cache/IStorageCacheListener.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.api.storage.cache; +package com.refinedmods.refinedstorage.api.storage.cache; -import com.raoulvdberge.refinedstorage.api.util.StackListResult; +import com.refinedmods.refinedstorage.api.util.StackListResult; import java.util.List; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/cache/InvalidateCause.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/cache/InvalidateCause.java similarity index 76% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/cache/InvalidateCause.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/cache/InvalidateCause.java index a85e8992e..3fb64452f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/cache/InvalidateCause.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/cache/InvalidateCause.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.storage.cache; +package com.refinedmods.refinedstorage.api.storage.cache; public enum InvalidateCause { UNKNOWN, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDisk.java similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDisk.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDisk.java index 7fdc75691..9054aff11 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDisk.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.api.storage.disk; +package com.refinedmods.refinedstorage.api.storage.disk; -import com.raoulvdberge.refinedstorage.api.storage.IStorage; +import com.refinedmods.refinedstorage.api.storage.IStorage; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskContainerContext.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskContainerContext.java similarity index 65% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskContainerContext.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskContainerContext.java index 35b8bd079..330986a86 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskContainerContext.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskContainerContext.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.api.storage.disk; +package com.refinedmods.refinedstorage.api.storage.disk; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.AccessType; /** * Stores relevant information about the container where the {@link IStorageDisk} is in. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskFactory.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskFactory.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskFactory.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskFactory.java index 31bde21e5..b67dff14b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskFactory.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.storage.disk; +package com.refinedmods.refinedstorage.api.storage.disk; import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.server.ServerWorld; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskListener.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskListener.java similarity index 73% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskListener.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskListener.java index 354e45f14..39045d400 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskListener.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.storage.disk; +package com.refinedmods.refinedstorage.api.storage.disk; /** * Listens to storage disk changes. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskManager.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskManager.java similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskManager.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskManager.java index a7d1143f8..2ca28e5d6 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskManager.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.storage.disk; +package com.refinedmods.refinedstorage.api.storage.disk; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskProvider.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskProvider.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskProvider.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskProvider.java index d2e33cc0a..11afc6a6b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskProvider.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.api.storage.disk; +package com.refinedmods.refinedstorage.api.storage.disk; -import com.raoulvdberge.refinedstorage.api.storage.StorageType; +import com.refinedmods.refinedstorage.api.storage.StorageType; import net.minecraft.item.ItemStack; import java.util.UUID; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskRegistry.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskRegistry.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskRegistry.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskRegistry.java index 6c2fbde50..f86f293cd 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskRegistry.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskRegistry.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.storage.disk; +package com.refinedmods.refinedstorage.api.storage.disk; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskSync.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskSync.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskSync.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskSync.java index cc9ab789f..49d8def72 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskSync.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskSync.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.storage.disk; +package com.refinedmods.refinedstorage.api.storage.disk; import javax.annotation.Nullable; import java.util.UUID; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/StorageDiskSyncData.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/StorageDiskSyncData.java similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/StorageDiskSyncData.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/disk/StorageDiskSyncData.java index 3642bc27a..fe01051b2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/StorageDiskSyncData.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/StorageDiskSyncData.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.storage.disk; +package com.refinedmods.refinedstorage.api.storage.disk; /** * Contains synced info about a storage disk. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/externalstorage/IExternalStorage.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/externalstorage/IExternalStorage.java similarity index 73% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/externalstorage/IExternalStorage.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/externalstorage/IExternalStorage.java index cf1489589..ea4c1952b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/externalstorage/IExternalStorage.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/externalstorage/IExternalStorage.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.api.storage.externalstorage; +package com.refinedmods.refinedstorage.api.storage.externalstorage; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.storage.IStorage; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.storage.IStorage; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCache; /** * An external storage handler. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/externalstorage/IExternalStorageContext.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/externalstorage/IExternalStorageContext.java similarity index 84% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/externalstorage/IExternalStorageContext.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/externalstorage/IExternalStorageContext.java index afd106100..08ecd6d41 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/externalstorage/IExternalStorageContext.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/externalstorage/IExternalStorageContext.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.api.storage.externalstorage; +package com.refinedmods.refinedstorage.api.storage.externalstorage; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.AccessType; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/externalstorage/IExternalStorageProvider.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/externalstorage/IExternalStorageProvider.java similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/externalstorage/IExternalStorageProvider.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/externalstorage/IExternalStorageProvider.java index bcad4e758..ea13f8997 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/externalstorage/IExternalStorageProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/externalstorage/IExternalStorageProvider.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.storage.externalstorage; +package com.refinedmods.refinedstorage.api.storage.externalstorage; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/tracker/IStorageTracker.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/tracker/IStorageTracker.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/tracker/IStorageTracker.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/tracker/IStorageTracker.java index 5b4915c91..b8c8bc569 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/tracker/IStorageTracker.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/tracker/IStorageTracker.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.storage.tracker; +package com.refinedmods.refinedstorage.api.storage.tracker; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/tracker/StorageTrackerEntry.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/tracker/StorageTrackerEntry.java similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/tracker/StorageTrackerEntry.java rename to src/main/java/com/refinedmods/refinedstorage/api/storage/tracker/StorageTrackerEntry.java index ef6c2b8e9..4bab3d9e9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/tracker/StorageTrackerEntry.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/tracker/StorageTrackerEntry.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.storage.tracker; +package com.refinedmods.refinedstorage.api.storage.tracker; /** * Represents a storage tracker entry. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/util/Action.java b/src/main/java/com/refinedmods/refinedstorage/api/util/Action.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/api/util/Action.java rename to src/main/java/com/refinedmods/refinedstorage/api/util/Action.java index 12e746ebd..d860fb088 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/util/Action.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/util/Action.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.util; +package com.refinedmods.refinedstorage.api.util; /** * Defines how an action is performed. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/util/IComparer.java b/src/main/java/com/refinedmods/refinedstorage/api/util/IComparer.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/com/raoulvdberge/refinedstorage/api/util/IComparer.java rename to src/main/java/com/refinedmods/refinedstorage/api/util/IComparer.java index 4bda5678f..f5f212f23 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/util/IComparer.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/util/IComparer.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.util; +package com.refinedmods.refinedstorage.api.util; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/util/IFilter.java b/src/main/java/com/refinedmods/refinedstorage/api/util/IFilter.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/api/util/IFilter.java rename to src/main/java/com/refinedmods/refinedstorage/api/util/IFilter.java index bf9a5cdf9..5fd25109f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/util/IFilter.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/util/IFilter.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.util; +package com.refinedmods.refinedstorage.api.util; /** * A filter. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/util/IQuantityFormatter.java b/src/main/java/com/refinedmods/refinedstorage/api/util/IQuantityFormatter.java similarity index 97% rename from src/main/java/com/raoulvdberge/refinedstorage/api/util/IQuantityFormatter.java rename to src/main/java/com/refinedmods/refinedstorage/api/util/IQuantityFormatter.java index efbe63457..8bad96a16 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/util/IQuantityFormatter.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/util/IQuantityFormatter.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.util; +package com.refinedmods.refinedstorage.api.util; /** * Utilities for formatting quantities. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/util/IStackList.java b/src/main/java/com/refinedmods/refinedstorage/api/util/IStackList.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/com/raoulvdberge/refinedstorage/api/util/IStackList.java rename to src/main/java/com/refinedmods/refinedstorage/api/util/IStackList.java index 7c4a3ecc6..aca13e545 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/util/IStackList.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/util/IStackList.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.util; +package com.refinedmods.refinedstorage.api.util; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/util/StackListEntry.java b/src/main/java/com/refinedmods/refinedstorage/api/util/StackListEntry.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/api/util/StackListEntry.java rename to src/main/java/com/refinedmods/refinedstorage/api/util/StackListEntry.java index 9ef5367f9..fd1b84ee0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/util/StackListEntry.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/util/StackListEntry.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.util; +package com.refinedmods.refinedstorage.api.util; import java.util.UUID; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/util/StackListResult.java b/src/main/java/com/refinedmods/refinedstorage/api/util/StackListResult.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/api/util/StackListResult.java rename to src/main/java/com/refinedmods/refinedstorage/api/util/StackListResult.java index be8bbd9f1..467528b7d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/util/StackListResult.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/util/StackListResult.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.util; +package com.refinedmods.refinedstorage.api.util; import java.util.UUID; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java old mode 100755 new mode 100644 similarity index 76% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java index 4ec4b01f0..526b82965 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java @@ -1,44 +1,44 @@ -package com.raoulvdberge.refinedstorage.apiimpl; +package com.refinedmods.refinedstorage.apiimpl; -import com.raoulvdberge.refinedstorage.api.IRSAPI; -import com.raoulvdberge.refinedstorage.api.RSAPIInject; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternRenderHandler; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementList; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry; -import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskRegistry; -import com.raoulvdberge.refinedstorage.api.network.INetworkManager; -import com.raoulvdberge.refinedstorage.api.network.grid.ICraftingGridBehavior; -import com.raoulvdberge.refinedstorage.api.network.grid.IGridManager; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeManager; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeRegistry; -import com.raoulvdberge.refinedstorage.api.storage.StorageType; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskManager; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskRegistry; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskSync; -import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStorageProvider; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.api.util.IQuantityFormatter; -import com.raoulvdberge.refinedstorage.api.util.IStackList; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementList; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementRegistry; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementRegistry; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingRequestInfo; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingTaskRegistry; -import com.raoulvdberge.refinedstorage.apiimpl.network.NetworkManager; -import com.raoulvdberge.refinedstorage.apiimpl.network.NetworkNodeManager; -import com.raoulvdberge.refinedstorage.apiimpl.network.NetworkNodeRegistry; -import com.raoulvdberge.refinedstorage.apiimpl.network.grid.CraftingGridBehavior; -import com.raoulvdberge.refinedstorage.apiimpl.network.grid.GridManager; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.*; -import com.raoulvdberge.refinedstorage.apiimpl.util.Comparer; -import com.raoulvdberge.refinedstorage.apiimpl.util.FluidStackList; -import com.raoulvdberge.refinedstorage.apiimpl.util.ItemStackList; -import com.raoulvdberge.refinedstorage.apiimpl.util.QuantityFormatter; +import com.refinedmods.refinedstorage.api.IRSAPI; +import com.refinedmods.refinedstorage.api.RSAPIInject; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternRenderHandler; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementList; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry; +import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry; +import com.refinedmods.refinedstorage.api.autocrafting.task.CraftingTaskReadException; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskRegistry; +import com.refinedmods.refinedstorage.api.network.INetworkManager; +import com.refinedmods.refinedstorage.api.network.grid.ICraftingGridBehavior; +import com.refinedmods.refinedstorage.api.network.grid.IGridManager; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.network.node.INetworkNodeManager; +import com.refinedmods.refinedstorage.api.network.node.INetworkNodeRegistry; +import com.refinedmods.refinedstorage.api.storage.StorageType; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskManager; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskRegistry; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskSync; +import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageProvider; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.api.util.IQuantityFormatter; +import com.refinedmods.refinedstorage.api.util.IStackList; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementList; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementRegistry; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementRegistry; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.task.CraftingRequestInfo; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.task.CraftingTaskRegistry; +import com.refinedmods.refinedstorage.apiimpl.network.NetworkManager; +import com.refinedmods.refinedstorage.apiimpl.network.NetworkNodeManager; +import com.refinedmods.refinedstorage.apiimpl.network.NetworkNodeRegistry; +import com.refinedmods.refinedstorage.apiimpl.network.grid.CraftingGridBehavior; +import com.refinedmods.refinedstorage.apiimpl.network.grid.GridManager; +import com.refinedmods.refinedstorage.apiimpl.storage.disk.*; +import com.refinedmods.refinedstorage.apiimpl.util.Comparer; +import com.refinedmods.refinedstorage.apiimpl.util.FluidStackList; +import com.refinedmods.refinedstorage.apiimpl.util.ItemStackList; +import com.refinedmods.refinedstorage.apiimpl.util.QuantityFormatter; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.INBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/AllowedTagList.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/AllowedTagList.java similarity index 98% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/AllowedTagList.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/AllowedTagList.java index d1e0178a0..458448fe0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/AllowedTagList.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/AllowedTagList.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting; +package com.refinedmods.refinedstorage.apiimpl.autocrafting; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingManager.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingManager.java index cf4eaacd3..3f0c5f99a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingManager.java @@ -1,18 +1,18 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting; +package com.refinedmods.refinedstorage.apiimpl.autocrafting; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingManager; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternChainList; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorListener; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskError; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskFactory; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingManager; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternChainList; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternContainer; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorListener; +import com.refinedmods.refinedstorage.api.autocrafting.task.CraftingTaskReadException; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTask; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskError; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskFactory; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPattern.java old mode 100755 new mode 100644 similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPattern.java index 63171b259..ed3800d00 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPattern.java @@ -1,10 +1,11 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting; +package com.refinedmods.refinedstorage.apiimpl.autocrafting; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternContainer; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v5.CraftingTaskFactory; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.CraftingInventory; import net.minecraft.inventory.container.Container; @@ -165,8 +166,8 @@ public class CraftingPattern implements ICraftingPattern { @Override public ResourceLocation getCraftingTaskFactoryId() { - return RS.SERVER_CONFIG.getAutocrafting().useExperimentalAutocrafting() ? com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6.CraftingTaskFactory.ID : - com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5.CraftingTaskFactory.ID; + return RS.SERVER_CONFIG.getAutocrafting().useExperimentalAutocrafting() ? com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v6.CraftingTaskFactory.ID : + CraftingTaskFactory.ID; } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternChain.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternChain.java similarity index 73% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternChain.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternChain.java index 6ee9d2e25..003928153 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternChain.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternChain.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting; +package com.refinedmods.refinedstorage.apiimpl.autocrafting; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternChain; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternChain; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java index 92d40871c..b25bc2b79 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting; +package com.refinedmods.refinedstorage.apiimpl.autocrafting; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternChain; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternChainList; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternChain; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternChainList; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java similarity index 97% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java index 3cd648919..c40f42e01 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting; +package com.refinedmods.refinedstorage.apiimpl.autocrafting; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer; -import com.raoulvdberge.refinedstorage.item.PatternItem; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternContainer; +import com.refinedmods.refinedstorage.item.PatternItem; import net.minecraft.fluid.Fluid; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.Item; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternFactoryException.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactoryException.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternFactoryException.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactoryException.java index 97208cc97..1a19b2d7d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternFactoryException.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactoryException.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting; +package com.refinedmods.refinedstorage.apiimpl.autocrafting; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementList.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementList.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementList.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementList.java index bed0205f7..ed8c91e77 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementList.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementList.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementList; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementList; import net.minecraft.util.ResourceLocation; import java.util.*; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementRegistry.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementRegistry.java old mode 100755 new mode 100644 similarity index 72% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementRegistry.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementRegistry.java index e5fe55f89..e4b6e2fc7 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementRegistry.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementRegistry.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry; import net.minecraft.network.PacketBuffer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java index 8ee2baa8a..c8d122a42 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.util.PacketBufferUtils; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; +import com.refinedmods.refinedstorage.api.render.IElementDrawers; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.util.PacketBufferUtils; import net.minecraft.client.resources.I18n; import net.minecraft.network.PacketBuffer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java index 46fe02400..6992ca362 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java @@ -1,12 +1,11 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; +import com.refinedmods.refinedstorage.api.render.IElementDrawers; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java index c7c9ccd97..f67e05ff4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java @@ -1,13 +1,12 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.util.RenderUtils; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; +import com.refinedmods.refinedstorage.api.render.IElementDrawers; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementRegistry.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementRegistry.java old mode 100755 new mode 100644 similarity index 73% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementRegistry.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementRegistry.java index 7101c142d..9f893e19e --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementRegistry.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementRegistry.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.preview; -import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; -import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry; +import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; +import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry; import net.minecraft.network.PacketBuffer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java index ddf759426..7eabe8745 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.preview; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskErrorType; -import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; +import com.refinedmods.refinedstorage.api.autocrafting.task.CraftingTaskErrorType; +import com.refinedmods.refinedstorage.api.render.IElementDrawers; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java index 30353dd8b..cd4018b4e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java @@ -1,12 +1,11 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.preview; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; -import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; +import com.refinedmods.refinedstorage.api.render.IElementDrawers; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java index fba044252..cc18af3f6 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java @@ -1,11 +1,10 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.preview; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; -import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; -import com.raoulvdberge.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; +import com.refinedmods.refinedstorage.api.render.IElementDrawers; +import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingRequestInfo.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/CraftingRequestInfo.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingRequestInfo.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/CraftingRequestInfo.java index c63674db1..4a469094a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingRequestInfo.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/CraftingRequestInfo.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.task; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.api.autocrafting.task.CraftingTaskReadException; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTaskRegistry.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/CraftingTaskRegistry.java similarity index 69% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTaskRegistry.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/CraftingTaskRegistry.java index d5c5f4ed4..6fa9dcc8e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTaskRegistry.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/CraftingTaskRegistry.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.task; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskFactory; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskRegistry; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskFactory; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskRegistry; import net.minecraft.util.ResourceLocation; import javax.annotation.Nullable; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/Crafting.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/Crafting.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/Crafting.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/Crafting.java index 7e24670af..6dac30b9e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/Crafting.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/Crafting.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v5; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.util.IStackList; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; +import com.refinedmods.refinedstorage.api.autocrafting.task.CraftingTaskReadException; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.util.IStackList; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTask.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTask.java similarity index 96% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTask.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTask.java index 03acbf15b..fce8df46c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTask.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTask.java @@ -1,30 +1,30 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v5; import com.google.common.collect.Maps; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.autocrafting.*; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementList; -import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.*; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.api.util.IStackList; -import com.raoulvdberge.refinedstorage.api.util.StackListEntry; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.ErrorCraftingMonitorElement; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.FluidCraftingMonitorElement; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.ItemCraftingMonitorElement; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.FluidCraftingPreviewElement; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.ItemCraftingPreviewElement; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.FluidStorageDisk; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.ItemStorageDisk; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.factory.FluidStorageDiskFactory; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.factory.ItemStorageDiskFactory; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.autocrafting.*; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementList; +import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; +import com.refinedmods.refinedstorage.api.autocrafting.task.*; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.api.util.IStackList; +import com.refinedmods.refinedstorage.api.util.StackListEntry; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor.ErrorCraftingMonitorElement; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor.FluidCraftingMonitorElement; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor.ItemCraftingMonitorElement; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.preview.FluidCraftingPreviewElement; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.preview.ItemCraftingPreviewElement; +import com.refinedmods.refinedstorage.apiimpl.storage.disk.FluidStorageDisk; +import com.refinedmods.refinedstorage.apiimpl.storage.disk.ItemStorageDisk; +import com.refinedmods.refinedstorage.apiimpl.storage.disk.factory.FluidStorageDiskFactory; +import com.refinedmods.refinedstorage.apiimpl.storage.disk.factory.ItemStorageDiskFactory; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTaskError.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskError.java similarity index 68% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTaskError.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskError.java index c8bd1c52c..c94a2782f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTaskError.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskError.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v5; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskErrorType; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskError; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; +import com.refinedmods.refinedstorage.api.autocrafting.task.CraftingTaskErrorType; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskError; import javax.annotation.Nullable; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskFactory.java new file mode 100644 index 000000000..9612dc02c --- /dev/null +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskFactory.java @@ -0,0 +1,28 @@ +package com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v5; + +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; +import com.refinedmods.refinedstorage.api.autocrafting.task.CraftingTaskReadException; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTask; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskFactory; +import com.refinedmods.refinedstorage.api.network.INetwork; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.ResourceLocation; + +import javax.annotation.Nonnull; + +public class CraftingTaskFactory implements ICraftingTaskFactory { + public static final ResourceLocation ID = new ResourceLocation(RS.ID, "v5"); + + @Nonnull + @Override + public ICraftingTask create(INetwork network, ICraftingRequestInfo requested, int quantity, ICraftingPattern pattern) { + return new CraftingTask(network, requested, quantity, pattern); + } + + @Override + public ICraftingTask createFromNbt(INetwork network, CompoundNBT tag) throws CraftingTaskReadException { + return new CraftingTask(network, tag); + } +} \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/Processing.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/Processing.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/Processing.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/Processing.java index b10bc1e40..12c711573 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/Processing.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/Processing.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v5; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.util.IStackList; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; +import com.refinedmods.refinedstorage.api.autocrafting.task.CraftingTaskReadException; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.util.IStackList; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.common.util.Constants; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/ProcessingState.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/ProcessingState.java similarity index 64% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/ProcessingState.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/ProcessingState.java index 9d1d1aaa9..f7233915e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/ProcessingState.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/ProcessingState.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v5; enum ProcessingState { READY, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/README.md b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/README.md similarity index 100% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/README.md rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/README.md diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/Craft.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/Craft.java similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/Craft.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/Craft.java index d8bd82390..ec904a09d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/Craft.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/Craft.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v6; import com.google.common.primitives.Ints; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.util.IStackList; -import com.raoulvdberge.refinedstorage.api.util.StackListEntry; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; +import com.refinedmods.refinedstorage.api.autocrafting.task.CraftingTaskReadException; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.util.IStackList; +import com.refinedmods.refinedstorage.api.util.StackListEntry; +import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; @@ -53,7 +53,7 @@ public abstract class Craft { } static Craft createCraftFromNBT(INetwork network, CompoundNBT tag) throws CraftingTaskReadException { - return tag.getBoolean(NBT_IS_PROCESSING) ? new Processing(network, tag) : new com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6.Crafting(network, tag); + return tag.getBoolean(NBT_IS_PROCESSING) ? new Processing(network, tag) : new Crafting(network, tag); } ICraftingPattern getPattern() { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/Crafting.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/Crafting.java similarity index 79% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/Crafting.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/Crafting.java index da0a958f5..b5d407e29 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/Crafting.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/Crafting.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v6; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; +import com.refinedmods.refinedstorage.api.autocrafting.task.CraftingTaskReadException; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java index c7cd770b2..a8961dd93 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java @@ -1,32 +1,32 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v6; import com.google.common.collect.ImmutableList; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternProvider; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementList; -import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.*; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.api.util.IStackList; -import com.raoulvdberge.refinedstorage.api.util.StackListEntry; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.ErrorCraftingMonitorElement; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.FluidCraftingMonitorElement; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.ItemCraftingMonitorElement; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.FluidCraftingPreviewElement; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.ItemCraftingPreviewElement; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.FluidStorageDisk; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.ItemStorageDisk; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.factory.FluidStorageDiskFactory; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.factory.ItemStorageDiskFactory; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternContainer; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternProvider; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementList; +import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; +import com.refinedmods.refinedstorage.api.autocrafting.task.*; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.api.util.IStackList; +import com.refinedmods.refinedstorage.api.util.StackListEntry; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor.ErrorCraftingMonitorElement; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor.FluidCraftingMonitorElement; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor.ItemCraftingMonitorElement; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.preview.FluidCraftingPreviewElement; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.preview.ItemCraftingPreviewElement; +import com.refinedmods.refinedstorage.apiimpl.storage.disk.FluidStorageDisk; +import com.refinedmods.refinedstorage.apiimpl.storage.disk.ItemStorageDisk; +import com.refinedmods.refinedstorage.apiimpl.storage.disk.factory.FluidStorageDiskFactory; +import com.refinedmods.refinedstorage.apiimpl.storage.disk.factory.ItemStorageDiskFactory; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; @@ -383,7 +383,7 @@ public class CraftingTask implements ICraftingTask { combineCommonStacks(recipe, ingredients, pattern); Craft craft = crafts.get(pattern); if (craft == null) { - craft = pattern.isProcessing() ? new Processing(pattern, root) : new com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6.Crafting(pattern, root, recipe); + craft = pattern.isProcessing() ? new Processing(pattern, root) : new Crafting(pattern, root, recipe); crafts.put(pattern, craft); } craft.addQuantity(qty); @@ -479,7 +479,7 @@ public class CraftingTask implements ICraftingTask { } } - if (craft instanceof com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6.Crafting) { + if (craft instanceof Crafting) { ItemStack output = pattern.getOutput(recipe); results.add(output, output.getCount() * qty); @@ -664,7 +664,7 @@ public class CraftingTask implements ICraftingTask { } } - private void updateCrafting(com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6.Crafting c) { + private void updateCrafting(Crafting c) { for (ICraftingPatternContainer container : network.getCraftingManager().getAllContainer(c.getPattern())) { @@ -951,8 +951,8 @@ public class CraftingTask implements ICraftingTask { return internalStorage.getStacks().isEmpty() && internalFluidStorage.getStacks().isEmpty(); } else { for (Craft craft : crafts.values()) { - if (craft instanceof com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6.Crafting) { - updateCrafting((com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6.Crafting) craft); + if (craft instanceof Crafting) { + updateCrafting((Crafting) craft); } else { updateProcessing((Processing) craft); } @@ -1123,9 +1123,9 @@ public class CraftingTask implements ICraftingTask { ICraftingMonitorElementList elements = API.instance().createCraftingMonitorElementList(); for (Craft craft : this.crafts.values()) { - if (craft instanceof com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6.Crafting ) { - if(craft.getQuantity() > 0) { - com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6.Crafting c = (com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6.Crafting) craft; + if (craft instanceof Crafting) { + if (craft.getQuantity() > 0) { + Crafting c = (Crafting) craft; for (ItemStack receive : c.getPattern().getOutputs()) { elements.add(new ItemCraftingMonitorElement(receive, 0, 0, 0, 0, receive.getCount() * c.getQuantity()), false); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskError.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTaskError.java similarity index 68% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskError.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTaskError.java index b94816996..bbb2f3768 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskError.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTaskError.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v6; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskErrorType; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskError; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; +import com.refinedmods.refinedstorage.api.autocrafting.task.CraftingTaskErrorType; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskError; import javax.annotation.Nullable; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTaskFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTaskFactory.java new file mode 100644 index 000000000..91f382427 --- /dev/null +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTaskFactory.java @@ -0,0 +1,28 @@ +package com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v6; + +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; +import com.refinedmods.refinedstorage.api.autocrafting.task.CraftingTaskReadException; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTask; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskFactory; +import com.refinedmods.refinedstorage.api.network.INetwork; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.ResourceLocation; + +import javax.annotation.Nonnull; + +public class CraftingTaskFactory implements ICraftingTaskFactory { + public static final ResourceLocation ID = new ResourceLocation(RS.ID, "v6"); + + @Nonnull + @Override + public ICraftingTask create(INetwork network, ICraftingRequestInfo requested, int quantity, ICraftingPattern pattern) { + return new CraftingTask(network, requested, quantity, pattern); + } + + @Override + public ICraftingTask createFromNbt(INetwork network, CompoundNBT tag) throws CraftingTaskReadException { + return new CraftingTask(network, tag); + } +} \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/Processing.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/Processing.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/Processing.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/Processing.java index c06227b99..d0eac21b5 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/Processing.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/Processing.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v6; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.util.IStackList; -import com.raoulvdberge.refinedstorage.api.util.StackListEntry; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; +import com.refinedmods.refinedstorage.api.autocrafting.task.CraftingTaskReadException; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.util.IStackList; +import com.refinedmods.refinedstorage.api.util.StackListEntry; +import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.common.util.Constants; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/ProcessingState.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/ProcessingState.java similarity index 61% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/ProcessingState.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/ProcessingState.java index e5335c386..9a9e2ec1c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/ProcessingState.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/ProcessingState.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6; +package com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v6; enum ProcessingState { READY, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/Network.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/Network.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java index a7c913e9a..3c9fc453f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/Network.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java @@ -1,38 +1,38 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network; +package com.refinedmods.refinedstorage.apiimpl.network; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingManager; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.INetworkNodeGraph; -import com.raoulvdberge.refinedstorage.api.network.NetworkType; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IFluidGridHandler; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler; -import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemManager; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.network.security.ISecurityManager; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.IStorage; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStorage; -import com.raoulvdberge.refinedstorage.api.storage.tracker.IStorageTracker; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingManager; -import com.raoulvdberge.refinedstorage.apiimpl.network.grid.handler.FluidGridHandler; -import com.raoulvdberge.refinedstorage.apiimpl.network.grid.handler.ItemGridHandler; -import com.raoulvdberge.refinedstorage.apiimpl.network.item.NetworkItemManager; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.RootNetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.network.security.SecurityManager; -import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.FluidStorageCache; -import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.ItemStorageCache; -import com.raoulvdberge.refinedstorage.apiimpl.storage.tracker.FluidStorageTracker; -import com.raoulvdberge.refinedstorage.apiimpl.storage.tracker.ItemStorageTracker; -import com.raoulvdberge.refinedstorage.block.ControllerBlock; -import com.raoulvdberge.refinedstorage.energy.BaseEnergyStorage; -import com.raoulvdberge.refinedstorage.tile.ControllerTile; -import com.raoulvdberge.refinedstorage.tile.config.IRedstoneConfigurable; -import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingManager; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.INetworkNodeGraph; +import com.refinedmods.refinedstorage.api.network.NetworkType; +import com.refinedmods.refinedstorage.api.network.grid.handler.IFluidGridHandler; +import com.refinedmods.refinedstorage.api.network.grid.handler.IItemGridHandler; +import com.refinedmods.refinedstorage.api.network.item.INetworkItemManager; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.network.security.ISecurityManager; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.IStorage; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCache; +import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorage; +import com.refinedmods.refinedstorage.api.storage.tracker.IStorageTracker; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.CraftingManager; +import com.refinedmods.refinedstorage.apiimpl.network.grid.handler.FluidGridHandler; +import com.refinedmods.refinedstorage.apiimpl.network.grid.handler.ItemGridHandler; +import com.refinedmods.refinedstorage.apiimpl.network.item.NetworkItemManager; +import com.refinedmods.refinedstorage.apiimpl.network.node.RootNetworkNode; +import com.refinedmods.refinedstorage.apiimpl.network.security.SecurityManager; +import com.refinedmods.refinedstorage.apiimpl.storage.cache.FluidStorageCache; +import com.refinedmods.refinedstorage.apiimpl.storage.cache.ItemStorageCache; +import com.refinedmods.refinedstorage.apiimpl.storage.tracker.FluidStorageTracker; +import com.refinedmods.refinedstorage.apiimpl.storage.tracker.ItemStorageTracker; +import com.refinedmods.refinedstorage.block.ControllerBlock; +import com.refinedmods.refinedstorage.energy.BaseEnergyStorage; +import com.refinedmods.refinedstorage.tile.ControllerTile; +import com.refinedmods.refinedstorage.tile.config.IRedstoneConfigurable; +import com.refinedmods.refinedstorage.tile.config.RedstoneMode; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkListener.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkListener.java similarity index 79% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkListener.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkListener.java index ba6dde8f9..b37043299 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkListener.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network; +package com.refinedmods.refinedstorage.apiimpl.network; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkManager.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkManager.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkManager.java index 3509b5817..d3e64d8dc 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkManager.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network; +package com.refinedmods.refinedstorage.apiimpl.network; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.INetworkManager; -import com.raoulvdberge.refinedstorage.api.network.NetworkType; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.INetworkManager; +import com.refinedmods.refinedstorage.api.network.NetworkType; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraph.java old mode 100755 new mode 100644 similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraph.java index e107d9938..fd05555f2 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraph.java @@ -1,13 +1,13 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network; +package com.refinedmods.refinedstorage.apiimpl.network; import com.google.common.collect.Sets; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.INetworkNodeGraph; -import com.raoulvdberge.refinedstorage.api.network.INetworkNodeGraphListener; -import com.raoulvdberge.refinedstorage.api.network.INetworkNodeVisitor; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.INetworkNodeGraph; +import com.refinedmods.refinedstorage.api.network.INetworkNodeGraphListener; +import com.refinedmods.refinedstorage.api.network.INetworkNodeVisitor; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeListener.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeListener.java old mode 100755 new mode 100644 similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeListener.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeListener.java index 45b71884c..d464e8bd0 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeListener.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network; +package com.refinedmods.refinedstorage.apiimpl.network; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeManager.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeManager.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeManager.java index bd9664d3a..468b0cd0c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeManager.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network; +package com.refinedmods.refinedstorage.apiimpl.network; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeFactory; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeManager; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.network.node.INetworkNodeFactory; +import com.refinedmods.refinedstorage.api.network.node.INetworkNodeManager; +import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeRegistry.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeRegistry.java old mode 100755 new mode 100644 similarity index 71% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeRegistry.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeRegistry.java index 945a9a660..a3a16aa89 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeRegistry.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeRegistry.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network; +package com.refinedmods.refinedstorage.apiimpl.network; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeFactory; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeRegistry; +import com.refinedmods.refinedstorage.api.network.node.INetworkNodeFactory; +import com.refinedmods.refinedstorage.api.network.node.INetworkNodeRegistry; import net.minecraft.util.ResourceLocation; import javax.annotation.Nullable; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/CraftingGridBehavior.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/CraftingGridBehavior.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/CraftingGridBehavior.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/CraftingGridBehavior.java index 27990fba1..dd2a9f71a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/CraftingGridBehavior.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/CraftingGridBehavior.java @@ -1,14 +1,14 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.grid; +package com.refinedmods.refinedstorage.apiimpl.network.grid; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.grid.GridType; -import com.raoulvdberge.refinedstorage.api.network.grid.ICraftingGridBehavior; -import com.raoulvdberge.refinedstorage.api.network.grid.INetworkAwareGrid; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.GridNetworkNode; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.grid.GridType; +import com.refinedmods.refinedstorage.api.network.grid.ICraftingGridBehavior; +import com.refinedmods.refinedstorage.api.network.grid.INetworkAwareGrid; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.CraftingInventory; import net.minecraft.inventory.InventoryHelper; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridManager.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridManager.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridManager.java index ef1aeb614..13b8e29c6 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridManager.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.grid; +package com.refinedmods.refinedstorage.apiimpl.network.grid; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.api.network.grid.IGridFactory; -import com.raoulvdberge.refinedstorage.api.network.grid.IGridManager; -import com.raoulvdberge.refinedstorage.container.factory.GridContainerProvider; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.api.network.grid.IGridFactory; +import com.refinedmods.refinedstorage.api.network.grid.IGridManager; +import com.refinedmods.refinedstorage.container.factory.GridContainerProvider; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridTab.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridTab.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java index b0b5d2b3c..68f80c1b7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/GridTab.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.grid; +package com.refinedmods.refinedstorage.apiimpl.network.grid; import com.mojang.blaze3d.systems.RenderSystem; -import com.raoulvdberge.refinedstorage.api.network.grid.IGridTab; -import com.raoulvdberge.refinedstorage.api.render.IElementDrawer; -import com.raoulvdberge.refinedstorage.api.util.IFilter; +import com.refinedmods.refinedstorage.api.network.grid.IGridTab; +import com.refinedmods.refinedstorage.api.render.IElementDrawer; +import com.refinedmods.refinedstorage.api.util.IFilter; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/factory/GridBlockGridFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/GridBlockGridFactory.java similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/factory/GridBlockGridFactory.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/GridBlockGridFactory.java index d6dee76cc..bb078bbdb 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/factory/GridBlockGridFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/GridBlockGridFactory.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.grid.factory; +package com.refinedmods.refinedstorage.apiimpl.network.grid.factory; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.grid.GridFactoryType; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.api.network.grid.IGridFactory; -import com.raoulvdberge.refinedstorage.tile.grid.GridTile; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.grid.GridFactoryType; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.api.network.grid.IGridFactory; +import com.refinedmods.refinedstorage.tile.grid.GridTile; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/factory/PortableGridBlockGridFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridBlockGridFactory.java similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/factory/PortableGridBlockGridFactory.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridBlockGridFactory.java index 514d63b93..c77f57aba 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/factory/PortableGridBlockGridFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridBlockGridFactory.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.grid.factory; +package com.refinedmods.refinedstorage.apiimpl.network.grid.factory; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.grid.GridFactoryType; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.api.network.grid.IGridFactory; -import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGridTile; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.grid.GridFactoryType; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.api.network.grid.IGridFactory; +import com.refinedmods.refinedstorage.tile.grid.portable.PortableGridTile; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/factory/PortableGridGridFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridGridFactory.java similarity index 72% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/factory/PortableGridGridFactory.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridGridFactory.java index f783413e6..ad1723c28 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/factory/PortableGridGridFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridGridFactory.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.grid.factory; +package com.refinedmods.refinedstorage.apiimpl.network.grid.factory; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.grid.GridFactoryType; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.api.network.grid.IGridFactory; -import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGrid; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.grid.GridFactoryType; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.api.network.grid.IGridFactory; +import com.refinedmods.refinedstorage.tile.grid.portable.PortableGrid; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/factory/WirelessFluidGridGridFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/WirelessFluidGridGridFactory.java similarity index 71% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/factory/WirelessFluidGridGridFactory.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/WirelessFluidGridGridFactory.java index 17e534b76..3f7384eec 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/factory/WirelessFluidGridGridFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/WirelessFluidGridGridFactory.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.grid.factory; +package com.refinedmods.refinedstorage.apiimpl.network.grid.factory; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.grid.GridFactoryType; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.api.network.grid.IGridFactory; -import com.raoulvdberge.refinedstorage.tile.grid.WirelessFluidGrid; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.grid.GridFactoryType; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.api.network.grid.IGridFactory; +import com.refinedmods.refinedstorage.tile.grid.WirelessFluidGrid; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/factory/WirelessGridGridFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/WirelessGridGridFactory.java similarity index 71% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/factory/WirelessGridGridFactory.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/WirelessGridGridFactory.java index 6e1d0e8e5..e6c913652 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/factory/WirelessGridGridFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/WirelessGridGridFactory.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.grid.factory; +package com.refinedmods.refinedstorage.apiimpl.network.grid.factory; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.grid.GridFactoryType; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.api.network.grid.IGridFactory; -import com.raoulvdberge.refinedstorage.tile.grid.WirelessGrid; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.grid.GridFactoryType; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.api.network.grid.IGridFactory; +import com.refinedmods.refinedstorage.tile.grid.WirelessGrid; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java index f3d75a9b6..d0687c5a8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java @@ -1,17 +1,17 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.grid.handler; +package com.refinedmods.refinedstorage.apiimpl.network.grid.handler; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskError; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IFluidGridHandler; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.ErrorCraftingPreviewElement; -import com.raoulvdberge.refinedstorage.network.grid.GridCraftingPreviewResponseMessage; -import com.raoulvdberge.refinedstorage.network.grid.GridCraftingStartResponseMessage; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTask; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskError; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.grid.handler.IFluidGridHandler; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.preview.ErrorCraftingPreviewElement; +import com.refinedmods.refinedstorage.network.grid.GridCraftingPreviewResponseMessage; +import com.refinedmods.refinedstorage.network.grid.GridCraftingStartResponseMessage; +import com.refinedmods.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java index 4b98664e0..c85849ebb 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java @@ -1,16 +1,16 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.grid.handler; +package com.refinedmods.refinedstorage.apiimpl.network.grid.handler; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskError; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.ErrorCraftingPreviewElement; -import com.raoulvdberge.refinedstorage.network.grid.GridCraftingPreviewResponseMessage; -import com.raoulvdberge.refinedstorage.network.grid.GridCraftingStartResponseMessage; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTask; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskError; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.grid.handler.IItemGridHandler; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.preview.ErrorCraftingPreviewElement; +import com.refinedmods.refinedstorage.network.grid.GridCraftingPreviewResponseMessage; +import com.refinedmods.refinedstorage.network.grid.GridCraftingStartResponseMessage; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java index 1fa57be3a..8d3352b04 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.grid.handler; +package com.refinedmods.refinedstorage.apiimpl.network.grid.handler; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IFluidGridHandler; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.grid.handler.IFluidGridHandler; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java index b4ece766f..c07c1d097 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.grid.handler; +package com.refinedmods.refinedstorage.apiimpl.network.grid.handler; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.api.network.grid.handler.IItemGridHandler; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/NetworkItemManager.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemManager.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/NetworkItemManager.java index 5e20ff0c4..26c90a299 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/NetworkItemManager.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.item; +package com.refinedmods.refinedstorage.apiimpl.network.item; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.IWirelessTransmitter; -import com.raoulvdberge.refinedstorage.api.network.item.INetworkItem; -import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemManager; -import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemProvider; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.IWirelessTransmitter; +import com.refinedmods.refinedstorage.api.network.item.INetworkItem; +import com.refinedmods.refinedstorage.api.network.item.INetworkItemManager; +import com.refinedmods.refinedstorage.api.network.item.INetworkItemProvider; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java index 10e0f3f71..e9124df45 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java @@ -1,15 +1,15 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.item; +package com.refinedmods.refinedstorage.apiimpl.network.item; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.item.INetworkItem; -import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemManager; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.container.factory.CraftingMonitorContainerProvider; -import com.raoulvdberge.refinedstorage.item.WirelessCraftingMonitorItem; -import com.raoulvdberge.refinedstorage.tile.craftingmonitor.WirelessCraftingMonitor; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.item.INetworkItem; +import com.refinedmods.refinedstorage.api.network.item.INetworkItemManager; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.container.factory.CraftingMonitorContainerProvider; +import com.refinedmods.refinedstorage.item.WirelessCraftingMonitorItem; +import com.refinedmods.refinedstorage.tile.craftingmonitor.WirelessCraftingMonitor; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java similarity index 79% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java index 2d934d08f..eb30f8533 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java @@ -1,14 +1,14 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.item; +package com.refinedmods.refinedstorage.apiimpl.network.item; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.item.INetworkItem; -import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemManager; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.network.grid.factory.WirelessFluidGridGridFactory; -import com.raoulvdberge.refinedstorage.item.WirelessFluidGridItem; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.item.INetworkItem; +import com.refinedmods.refinedstorage.api.network.item.INetworkItemManager; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.network.grid.factory.WirelessFluidGridGridFactory; +import com.refinedmods.refinedstorage.item.WirelessFluidGridItem; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java similarity index 79% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java index 25deb665e..372d833d2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java @@ -1,14 +1,14 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.item; +package com.refinedmods.refinedstorage.apiimpl.network.item; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.item.INetworkItem; -import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemManager; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.network.grid.factory.WirelessGridGridFactory; -import com.raoulvdberge.refinedstorage.item.WirelessGridItem; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.item.INetworkItem; +import com.refinedmods.refinedstorage.api.network.item.INetworkItemManager; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.network.grid.factory.WirelessGridGridFactory; +import com.refinedmods.refinedstorage.item.WirelessGridItem; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/CableNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CableNetworkNode.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/CableNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CableNetworkNode.java index b1aaa9030..4d9af480a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/CableNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CableNetworkNode.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.RS; +import com.refinedmods.refinedstorage.RS; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/ConnectivityStateChangeCause.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConnectivityStateChangeCause.java similarity index 63% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/ConnectivityStateChangeCause.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConnectivityStateChangeCause.java index 283100b16..63a6c0603 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/ConnectivityStateChangeCause.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConnectivityStateChangeCause.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; public enum ConnectivityStateChangeCause { GRAPH_CHANGE, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java index aff82d7dc..1bd54a1a2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java @@ -1,19 +1,19 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.UpgradeItemHandler; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeInventoryListener; -import com.raoulvdberge.refinedstorage.item.UpgradeItem; -import com.raoulvdberge.refinedstorage.tile.ConstructorTile; -import com.raoulvdberge.refinedstorage.tile.config.IComparable; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.util.StackUtils; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.item.UpgradeItemHandler; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; +import com.refinedmods.refinedstorage.item.UpgradeItem; +import com.refinedmods.refinedstorage.tile.ConstructorTile; +import com.refinedmods.refinedstorage.tile.config.IComparable; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.dispenser.DefaultDispenseItemBehavior; import net.minecraft.dispenser.Position; import net.minecraft.entity.item.FireworkRocketEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/CrafterManagerNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterManagerNetworkNode.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/CrafterManagerNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterManagerNetworkNode.java index 3d74c5c1f..f24f257ab 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/CrafterManagerNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterManagerNetworkNode.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.block.CrafterManagerBlock; -import com.raoulvdberge.refinedstorage.block.NetworkNodeBlock; -import com.raoulvdberge.refinedstorage.tile.CrafterManagerTile; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.block.CrafterManagerBlock; +import com.refinedmods.refinedstorage.block.NetworkNodeBlock; +import com.refinedmods.refinedstorage.tile.CrafterManagerTile; import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java index 119fc14af..336f17bb3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java @@ -1,19 +1,19 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternProvider; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.UpgradeItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.validator.PatternItemValidator; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeInventoryListener; -import com.raoulvdberge.refinedstorage.item.UpgradeItem; -import com.raoulvdberge.refinedstorage.util.StackUtils; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternContainer; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternProvider; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.item.UpgradeItemHandler; +import com.refinedmods.refinedstorage.inventory.item.validator.PatternItemValidator; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; +import com.refinedmods.refinedstorage.item.UpgradeItem; +import com.refinedmods.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java index 8374ba97d..7296f7407 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java @@ -1,14 +1,14 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingManager; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; -import com.raoulvdberge.refinedstorage.block.CraftingMonitorBlock; -import com.raoulvdberge.refinedstorage.block.NetworkNodeBlock; -import com.raoulvdberge.refinedstorage.tile.craftingmonitor.CraftingMonitorTile; -import com.raoulvdberge.refinedstorage.tile.craftingmonitor.ICraftingMonitor; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingManager; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTask; +import com.refinedmods.refinedstorage.block.CraftingMonitorBlock; +import com.refinedmods.refinedstorage.block.NetworkNodeBlock; +import com.refinedmods.refinedstorage.tile.craftingmonitor.CraftingMonitorTile; +import com.refinedmods.refinedstorage.tile.craftingmonitor.ICraftingMonitor; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java index 801057d31..167ba97bb 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java @@ -1,20 +1,20 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.UpgradeItemHandler; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeInventoryListener; -import com.raoulvdberge.refinedstorage.item.UpgradeItem; -import com.raoulvdberge.refinedstorage.tile.DestructorTile; -import com.raoulvdberge.refinedstorage.tile.config.IComparable; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.tile.config.IWhitelistBlacklist; -import com.raoulvdberge.refinedstorage.util.StackUtils; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.item.UpgradeItemHandler; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; +import com.refinedmods.refinedstorage.item.UpgradeItem; +import com.refinedmods.refinedstorage.tile.DestructorTile; +import com.refinedmods.refinedstorage.tile.config.IComparable; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; +import com.refinedmods.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java index 558c4eb24..3c4468606 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java @@ -1,19 +1,19 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSBlocks; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.block.DetectorBlock; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeInventoryListener; -import com.raoulvdberge.refinedstorage.tile.DetectorTile; -import com.raoulvdberge.refinedstorage.tile.config.IComparable; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSBlocks; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.block.DetectorBlock; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; +import com.refinedmods.refinedstorage.tile.DetectorTile; +import com.refinedmods.refinedstorage.tile.config.IComparable; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.tile.config.RedstoneMode; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/DiskState.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DiskState.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/DiskState.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DiskState.java index 1861f0214..608cc7dfd 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/DiskState.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DiskState.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; public enum DiskState { NONE, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java index d871bbeb4..adae81a6b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java @@ -1,20 +1,20 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.UpgradeItemHandler; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeInventoryListener; -import com.raoulvdberge.refinedstorage.item.UpgradeItem; -import com.raoulvdberge.refinedstorage.tile.ExporterTile; -import com.raoulvdberge.refinedstorage.tile.config.IComparable; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.util.StackUtils; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.item.UpgradeItemHandler; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; +import com.refinedmods.refinedstorage.item.UpgradeItem; +import com.refinedmods.refinedstorage.tile.ExporterTile; +import com.refinedmods.refinedstorage.tile.config.IComparable; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java index 456b66cd9..3e7588afc 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java @@ -1,28 +1,28 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.IStorage; -import com.raoulvdberge.refinedstorage.api.storage.IStorageProvider; -import com.raoulvdberge.refinedstorage.api.storage.StorageType; -import com.raoulvdberge.refinedstorage.api.storage.cache.InvalidateCause; -import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStorage; -import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStorageContext; -import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStorageProvider; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.FluidStorageCache; -import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.ItemStorageCache; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeInventoryListener; -import com.raoulvdberge.refinedstorage.tile.ExternalStorageTile; -import com.raoulvdberge.refinedstorage.tile.config.*; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import com.raoulvdberge.refinedstorage.util.AccessTypeUtils; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.IStorage; +import com.refinedmods.refinedstorage.api.storage.IStorageProvider; +import com.refinedmods.refinedstorage.api.storage.StorageType; +import com.refinedmods.refinedstorage.api.storage.cache.InvalidateCause; +import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorage; +import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageContext; +import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageProvider; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.storage.cache.FluidStorageCache; +import com.refinedmods.refinedstorage.apiimpl.storage.cache.ItemStorageCache; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; +import com.refinedmods.refinedstorage.tile.ExternalStorageTile; +import com.refinedmods.refinedstorage.tile.config.*; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.util.AccessTypeUtils; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java index 7c419ac78..e93a8c6bb 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java @@ -1,21 +1,21 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.storage.externalstorage.FluidExternalStorage; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.fluid.ProxyFluidHandler; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.UpgradeItemHandler; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeInventoryListener; -import com.raoulvdberge.refinedstorage.item.UpgradeItem; -import com.raoulvdberge.refinedstorage.tile.FluidInterfaceTile; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.storage.externalstorage.FluidExternalStorage; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.inventory.fluid.ProxyFluidHandler; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.item.UpgradeItemHandler; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; +import com.refinedmods.refinedstorage.item.UpgradeItem; +import com.refinedmods.refinedstorage.tile.FluidInterfaceTile; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.Direction; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/GridNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/GridNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java index d7b84646a..b4112ec14 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/GridNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java @@ -1,33 +1,33 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSItems; -import com.raoulvdberge.refinedstorage.api.network.grid.*; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IFluidGridHandler; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.api.util.IFilter; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.AllowedTagList; -import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener.FluidGridStorageCacheListener; -import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener.ItemGridStorageCacheListener; -import com.raoulvdberge.refinedstorage.block.GridBlock; -import com.raoulvdberge.refinedstorage.block.NetworkNodeBlock; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.FilterItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidator; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeInventoryListener; -import com.raoulvdberge.refinedstorage.item.PatternItem; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; -import com.raoulvdberge.refinedstorage.tile.grid.GridTile; -import com.raoulvdberge.refinedstorage.util.GridUtils; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSItems; +import com.refinedmods.refinedstorage.api.network.grid.*; +import com.refinedmods.refinedstorage.api.network.grid.handler.IFluidGridHandler; +import com.refinedmods.refinedstorage.api.network.grid.handler.IItemGridHandler; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCache; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCacheListener; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.api.util.IFilter; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.AllowedTagList; +import com.refinedmods.refinedstorage.apiimpl.storage.cache.listener.FluidGridStorageCacheListener; +import com.refinedmods.refinedstorage.apiimpl.storage.cache.listener.ItemGridStorageCacheListener; +import com.refinedmods.refinedstorage.block.GridBlock; +import com.refinedmods.refinedstorage.block.NetworkNodeBlock; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.item.FilterItemHandler; +import com.refinedmods.refinedstorage.inventory.item.validator.ItemValidator; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; +import com.refinedmods.refinedstorage.item.PatternItem; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.tile.grid.GridTile; +import com.refinedmods.refinedstorage.util.GridUtils; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/IStorageScreen.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/IStorageScreen.java similarity index 73% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/IStorageScreen.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/IStorageScreen.java index 768bebf3a..93805083d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/IStorageScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/IStorageScreen.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.util.text.ITextComponent; public interface IStorageScreen { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java index 1e10317f4..a32685159 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java @@ -1,21 +1,21 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.UpgradeItemHandler; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeInventoryListener; -import com.raoulvdberge.refinedstorage.item.UpgradeItem; -import com.raoulvdberge.refinedstorage.tile.DiskDriveTile; -import com.raoulvdberge.refinedstorage.tile.ImporterTile; -import com.raoulvdberge.refinedstorage.tile.config.IComparable; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.tile.config.IWhitelistBlacklist; -import com.raoulvdberge.refinedstorage.util.StackUtils; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.item.UpgradeItemHandler; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; +import com.refinedmods.refinedstorage.item.UpgradeItem; +import com.refinedmods.refinedstorage.tile.DiskDriveTile; +import com.refinedmods.refinedstorage.tile.ImporterTile; +import com.refinedmods.refinedstorage.tile.config.IComparable; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; +import com.refinedmods.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java index 769f77566..19fed2264 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java @@ -1,19 +1,19 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.storage.externalstorage.ItemExternalStorage; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.ProxyItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.UpgradeItemHandler; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeInventoryListener; -import com.raoulvdberge.refinedstorage.item.UpgradeItem; -import com.raoulvdberge.refinedstorage.tile.config.IComparable; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.storage.externalstorage.ItemExternalStorage; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.item.ProxyItemHandler; +import com.refinedmods.refinedstorage.inventory.item.UpgradeItemHandler; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; +import com.refinedmods.refinedstorage.item.UpgradeItem; +import com.refinedmods.refinedstorage.tile.config.IComparable; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.Direction; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java old mode 100755 new mode 100644 similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java index 1e0dfdb79..a67352a26 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java @@ -1,13 +1,13 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.INetworkNodeVisitor; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.block.BaseBlock; -import com.raoulvdberge.refinedstorage.block.NetworkNodeBlock; -import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.INetworkNodeVisitor; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.block.BaseBlock; +import com.refinedmods.refinedstorage.block.NetworkNodeBlock; +import com.refinedmods.refinedstorage.tile.config.RedstoneMode; import net.minecraft.block.BlockState; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkReceiverNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkReceiverNetworkNode.java similarity index 84% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkReceiverNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkReceiverNetworkNode.java index ddf079433..ac2359c32 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkReceiverNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkReceiverNetworkNode.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.RS; +import com.refinedmods.refinedstorage.RS; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java index c2f82a104..9268d2869 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java @@ -1,13 +1,14 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSItems; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidator; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeInventoryListener; -import com.raoulvdberge.refinedstorage.item.NetworkCardItem; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSItems; +import com.refinedmods.refinedstorage.api.network.INetworkNodeVisitor; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.item.validator.ItemValidator; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; +import com.refinedmods.refinedstorage.item.NetworkCardItem; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; @@ -114,7 +115,7 @@ public class NetworkTransmitterNetworkNode extends NetworkNode { } @Override - public void visit(Operator operator) { + public void visit(INetworkNodeVisitor.Operator operator) { super.visit(operator); if (canTransmit()) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/RelayNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RelayNetworkNode.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/RelayNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RelayNetworkNode.java index 7df803791..b5436dd7b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/RelayNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RelayNetworkNode.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.tile.config.RedstoneMode; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/RootNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RootNetworkNode.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/RootNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RootNetworkNode.java index 60a2593c6..2af9f2bf3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/RootNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RootNetworkNode.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.INetworkNodeVisitor; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.INetworkNodeVisitor; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraft.block.BlockState; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/SecurityManagerNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SecurityManagerNetworkNode.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/SecurityManagerNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SecurityManagerNetworkNode.java index ae00acdf7..dbf1cae75 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/SecurityManagerNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SecurityManagerNetworkNode.java @@ -1,17 +1,17 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSItems; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.security.ISecurityCard; -import com.raoulvdberge.refinedstorage.api.network.security.ISecurityCardContainer; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.apiimpl.network.security.SecurityCard; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidator; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeInventoryListener; -import com.raoulvdberge.refinedstorage.item.SecurityCardItem; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSItems; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.security.ISecurityCard; +import com.refinedmods.refinedstorage.api.network.security.ISecurityCardContainer; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.apiimpl.network.security.SecurityCard; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.item.validator.ItemValidator; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; +import com.refinedmods.refinedstorage.item.SecurityCardItem; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/SlottedCraftingRequest.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SlottedCraftingRequest.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/SlottedCraftingRequest.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SlottedCraftingRequest.java index fe47a4c12..72a353986 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/SlottedCraftingRequest.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SlottedCraftingRequest.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; import java.util.Objects; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java index cf5498c25..94de8c872 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java @@ -1,20 +1,20 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeInventoryListener; -import com.raoulvdberge.refinedstorage.tile.StorageMonitorTile; -import com.raoulvdberge.refinedstorage.tile.config.IComparable; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; -import com.raoulvdberge.refinedstorage.util.StackUtils; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; +import com.refinedmods.refinedstorage.tile.StorageMonitorTile; +import com.refinedmods.refinedstorage.tile.config.IComparable; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.tile.config.RedstoneMode; +import com.refinedmods.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java index 9a0e3e597..affddb464 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node; +package com.refinedmods.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.IWirelessTransmitter; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.UpgradeItemHandler; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeInventoryListener; -import com.raoulvdberge.refinedstorage.item.UpgradeItem; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.IWirelessTransmitter; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.item.UpgradeItemHandler; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; +import com.refinedmods.refinedstorage.item.UpgradeItem; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java similarity index 84% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java index acbd3d551..c2fecb5d0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java @@ -1,29 +1,29 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node.diskdrive; +package com.refinedmods.refinedstorage.apiimpl.network.node.diskdrive; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.IStorage; -import com.raoulvdberge.refinedstorage.api.storage.IStorageProvider; -import com.raoulvdberge.refinedstorage.api.storage.cache.InvalidateCause; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.ConnectivityStateChangeCause; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.DiskState; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.FluidStorageCache; -import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.ItemStorageCache; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.validator.StorageDiskItemValidator; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeInventoryListener; -import com.raoulvdberge.refinedstorage.tile.DiskDriveTile; -import com.raoulvdberge.refinedstorage.tile.config.*; -import com.raoulvdberge.refinedstorage.util.AccessTypeUtils; -import com.raoulvdberge.refinedstorage.util.StackUtils; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.IStorage; +import com.refinedmods.refinedstorage.api.storage.IStorageProvider; +import com.refinedmods.refinedstorage.api.storage.cache.InvalidateCause; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.apiimpl.network.node.ConnectivityStateChangeCause; +import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState; +import com.refinedmods.refinedstorage.apiimpl.network.node.NetworkNode; +import com.refinedmods.refinedstorage.apiimpl.storage.cache.FluidStorageCache; +import com.refinedmods.refinedstorage.apiimpl.storage.cache.ItemStorageCache; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.item.validator.StorageDiskItemValidator; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; +import com.refinedmods.refinedstorage.tile.DiskDriveTile; +import com.refinedmods.refinedstorage.tile.config.*; +import com.refinedmods.refinedstorage.util.AccessTypeUtils; +import com.refinedmods.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/FluidDriveWrapperStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/FluidDriveWrapperStorageDisk.java similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/FluidDriveWrapperStorageDisk.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/FluidDriveWrapperStorageDisk.java index 6f98b7536..bc3763f1f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/FluidDriveWrapperStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/FluidDriveWrapperStorageDisk.java @@ -1,13 +1,13 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node.diskdrive; +package com.refinedmods.refinedstorage.apiimpl.network.node.diskdrive; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskListener; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.DiskState; -import com.raoulvdberge.refinedstorage.tile.config.IWhitelistBlacklist; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskListener; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState; +import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/ItemDriveWrapperStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/ItemDriveWrapperStorageDisk.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/ItemDriveWrapperStorageDisk.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/ItemDriveWrapperStorageDisk.java index b61ccb7cd..b409b30c4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/ItemDriveWrapperStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/ItemDriveWrapperStorageDisk.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node.diskdrive; +package com.refinedmods.refinedstorage.apiimpl.network.node.diskdrive; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskListener; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.DiskState; -import com.raoulvdberge.refinedstorage.tile.config.IWhitelistBlacklist; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskListener; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState; +import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java index 2d6be2246..c693e52df 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java @@ -1,28 +1,28 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node.diskmanipulator; +package com.refinedmods.refinedstorage.apiimpl.network.node.diskmanipulator; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.api.util.StackListEntry; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.DiskState; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.ProxyItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.UpgradeItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.validator.StorageDiskItemValidator; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeInventoryListener; -import com.raoulvdberge.refinedstorage.item.UpgradeItem; -import com.raoulvdberge.refinedstorage.tile.DiskManipulatorTile; -import com.raoulvdberge.refinedstorage.tile.config.IComparable; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.tile.config.IWhitelistBlacklist; -import com.raoulvdberge.refinedstorage.util.StackUtils; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.api.util.StackListEntry; +import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState; +import com.refinedmods.refinedstorage.apiimpl.network.node.NetworkNode; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.item.ProxyItemHandler; +import com.refinedmods.refinedstorage.inventory.item.UpgradeItemHandler; +import com.refinedmods.refinedstorage.inventory.item.validator.StorageDiskItemValidator; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; +import com.refinedmods.refinedstorage.item.UpgradeItem; +import com.refinedmods.refinedstorage.tile.DiskManipulatorTile; +import com.refinedmods.refinedstorage.tile.config.IComparable; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; +import com.refinedmods.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java index 8ab0cd6a2..1f6801a78 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java @@ -1,14 +1,14 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node.diskmanipulator; +package com.refinedmods.refinedstorage.apiimpl.network.node.diskmanipulator; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskListener; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.DiskState; -import com.raoulvdberge.refinedstorage.tile.config.IWhitelistBlacklist; -import com.raoulvdberge.refinedstorage.util.StackUtils; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskListener; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState; +import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; +import com.refinedmods.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskItemManipulatorWrapper.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskItemManipulatorWrapper.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskItemManipulatorWrapper.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskItemManipulatorWrapper.java index 03af35a5e..27df6c216 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskItemManipulatorWrapper.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskItemManipulatorWrapper.java @@ -1,13 +1,13 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node.diskmanipulator; +package com.refinedmods.refinedstorage.apiimpl.network.node.diskmanipulator; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskListener; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.DiskState; -import com.raoulvdberge.refinedstorage.tile.config.IWhitelistBlacklist; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskListener; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState; +import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/FluidStorageNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageNetworkNode.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/FluidStorageNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageNetworkNode.java index 1ca7ed7e4..963ef3f39 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/FluidStorageNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageNetworkNode.java @@ -1,30 +1,30 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node.storage; +package com.refinedmods.refinedstorage.apiimpl.network.node.storage; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.IStorage; -import com.raoulvdberge.refinedstorage.api.storage.IStorageProvider; -import com.raoulvdberge.refinedstorage.api.storage.cache.InvalidateCause; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.ConnectivityStateChangeCause; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.IStorageScreen; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.storage.FluidStorageType; -import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.FluidStorageCache; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; -import com.raoulvdberge.refinedstorage.tile.FluidStorageTile; -import com.raoulvdberge.refinedstorage.tile.config.IAccessType; -import com.raoulvdberge.refinedstorage.tile.config.IComparable; -import com.raoulvdberge.refinedstorage.tile.config.IPrioritizable; -import com.raoulvdberge.refinedstorage.tile.config.IWhitelistBlacklist; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import com.raoulvdberge.refinedstorage.util.AccessTypeUtils; -import com.raoulvdberge.refinedstorage.util.FluidStorageBlockUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.IStorage; +import com.refinedmods.refinedstorage.api.storage.IStorageProvider; +import com.refinedmods.refinedstorage.api.storage.cache.InvalidateCause; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.network.node.ConnectivityStateChangeCause; +import com.refinedmods.refinedstorage.apiimpl.network.node.IStorageScreen; +import com.refinedmods.refinedstorage.apiimpl.network.node.NetworkNode; +import com.refinedmods.refinedstorage.apiimpl.storage.FluidStorageType; +import com.refinedmods.refinedstorage.apiimpl.storage.cache.FluidStorageCache; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; +import com.refinedmods.refinedstorage.tile.FluidStorageTile; +import com.refinedmods.refinedstorage.tile.config.IAccessType; +import com.refinedmods.refinedstorage.tile.config.IComparable; +import com.refinedmods.refinedstorage.tile.config.IPrioritizable; +import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.util.AccessTypeUtils; +import com.refinedmods.refinedstorage.util.FluidStorageBlockUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/FluidStorageWrapperStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageWrapperStorageDisk.java similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/FluidStorageWrapperStorageDisk.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageWrapperStorageDisk.java index 573900f25..5970d9c51 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/FluidStorageWrapperStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageWrapperStorageDisk.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node.storage; +package com.refinedmods.refinedstorage.apiimpl.network.node.storage; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskListener; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.tile.config.IWhitelistBlacklist; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskListener; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/ItemStorageWrapperStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/ItemStorageWrapperStorageDisk.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/ItemStorageWrapperStorageDisk.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/ItemStorageWrapperStorageDisk.java index e5f3c1f4b..0a90a932b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/ItemStorageWrapperStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/ItemStorageWrapperStorageDisk.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node.storage; +package com.refinedmods.refinedstorage.apiimpl.network.node.storage; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskListener; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.tile.config.IWhitelistBlacklist; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskListener; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java index ede464295..6d81b9e2e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java @@ -1,31 +1,31 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.node.storage; +package com.refinedmods.refinedstorage.apiimpl.network.node.storage; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.IStorage; -import com.raoulvdberge.refinedstorage.api.storage.IStorageProvider; -import com.raoulvdberge.refinedstorage.api.storage.cache.InvalidateCause; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.ConnectivityStateChangeCause; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.IStorageScreen; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.storage.ItemStorageType; -import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.ItemStorageCache; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeInventoryListener; -import com.raoulvdberge.refinedstorage.tile.StorageTile; -import com.raoulvdberge.refinedstorage.tile.config.IAccessType; -import com.raoulvdberge.refinedstorage.tile.config.IComparable; -import com.raoulvdberge.refinedstorage.tile.config.IPrioritizable; -import com.raoulvdberge.refinedstorage.tile.config.IWhitelistBlacklist; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import com.raoulvdberge.refinedstorage.util.AccessTypeUtils; -import com.raoulvdberge.refinedstorage.util.StackUtils; -import com.raoulvdberge.refinedstorage.util.StorageBlockUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.IStorage; +import com.refinedmods.refinedstorage.api.storage.IStorageProvider; +import com.refinedmods.refinedstorage.api.storage.cache.InvalidateCause; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.network.node.ConnectivityStateChangeCause; +import com.refinedmods.refinedstorage.apiimpl.network.node.IStorageScreen; +import com.refinedmods.refinedstorage.apiimpl.network.node.NetworkNode; +import com.refinedmods.refinedstorage.apiimpl.storage.ItemStorageType; +import com.refinedmods.refinedstorage.apiimpl.storage.cache.ItemStorageCache; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; +import com.refinedmods.refinedstorage.tile.StorageTile; +import com.refinedmods.refinedstorage.tile.config.IAccessType; +import com.refinedmods.refinedstorage.tile.config.IComparable; +import com.refinedmods.refinedstorage.tile.config.IPrioritizable; +import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.util.AccessTypeUtils; +import com.refinedmods.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.util.StorageBlockUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/security/SecurityCard.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/security/SecurityCard.java old mode 100755 new mode 100644 similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/security/SecurityCard.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/security/SecurityCard.java index 966836833..604313865 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/security/SecurityCard.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/security/SecurityCard.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.security; +package com.refinedmods.refinedstorage.apiimpl.network.security; -import com.raoulvdberge.refinedstorage.api.network.security.ISecurityCard; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.api.network.security.ISecurityCard; +import com.refinedmods.refinedstorage.api.network.security.Permission; import javax.annotation.Nullable; import java.util.HashMap; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/security/SecurityManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/security/SecurityManager.java old mode 100755 new mode 100644 similarity index 78% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/security/SecurityManager.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/network/security/SecurityManager.java index eecf8d6ed..976a29f50 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/security/SecurityManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/security/SecurityManager.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.apiimpl.network.security; +package com.refinedmods.refinedstorage.apiimpl.network.security; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.network.security.ISecurityCard; -import com.raoulvdberge.refinedstorage.api.network.security.ISecurityCardContainer; -import com.raoulvdberge.refinedstorage.api.network.security.ISecurityManager; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.network.security.ISecurityCard; +import com.refinedmods.refinedstorage.api.network.security.ISecurityCardContainer; +import com.refinedmods.refinedstorage.api.network.security.ISecurityManager; +import com.refinedmods.refinedstorage.api.network.security.Permission; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.management.OpList; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java index dc870077e..a8833138c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java @@ -1,10 +1,9 @@ -package com.raoulvdberge.refinedstorage.apiimpl.render; +package com.refinedmods.refinedstorage.apiimpl.render; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.render.IElementDrawer; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.render.IElementDrawer; +import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.client.gui.AbstractGui; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java index 66ffa9c8a..2d9f73db2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java @@ -1,9 +1,8 @@ -package com.raoulvdberge.refinedstorage.apiimpl.render; +package com.refinedmods.refinedstorage.apiimpl.render; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import com.raoulvdberge.refinedstorage.api.render.IElementDrawer; -import com.raoulvdberge.refinedstorage.screen.grid.CraftingPreviewScreen; +import com.refinedmods.refinedstorage.api.render.IElementDrawer; +import com.refinedmods.refinedstorage.screen.grid.CraftingPreviewScreen; import net.minecraft.client.gui.FontRenderer; public class CraftingPreviewElementDrawers extends ElementDrawers { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/render/ElementDrawers.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/ElementDrawers.java similarity index 73% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/render/ElementDrawers.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/render/ElementDrawers.java index a150a405e..f7132fdd9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/render/ElementDrawers.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/ElementDrawers.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.apiimpl.render; +package com.refinedmods.refinedstorage.apiimpl.render; -import com.raoulvdberge.refinedstorage.api.render.IElementDrawer; -import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; -import com.raoulvdberge.refinedstorage.render.FluidRenderer; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.api.render.IElementDrawer; +import com.refinedmods.refinedstorage.api.render.IElementDrawers; +import com.refinedmods.refinedstorage.render.FluidRenderer; +import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/FluidStorageType.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/FluidStorageType.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/FluidStorageType.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/FluidStorageType.java index 7ca719aed..9d1d706c4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/FluidStorageType.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/FluidStorageType.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage; +package com.refinedmods.refinedstorage.apiimpl.storage; public enum FluidStorageType { SIXTY_FOUR_K("64k", 64_000), diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/ItemStorageType.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/ItemStorageType.java similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/ItemStorageType.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/ItemStorageType.java index 1f7b40d48..9bc2e3134 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/ItemStorageType.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/ItemStorageType.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage; +package com.refinedmods.refinedstorage.apiimpl.storage; public enum ItemStorageType { ONE_K("1k", 1000), diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/FluidStorageCache.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/FluidStorageCache.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/FluidStorageCache.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/FluidStorageCache.java index 5a8b957b2..c134d54b4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/FluidStorageCache.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/FluidStorageCache.java @@ -1,15 +1,15 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.cache; +package com.refinedmods.refinedstorage.apiimpl.storage.cache; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.IStorage; -import com.raoulvdberge.refinedstorage.api.storage.IStorageProvider; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; -import com.raoulvdberge.refinedstorage.api.storage.cache.InvalidateCause; -import com.raoulvdberge.refinedstorage.api.util.IStackList; -import com.raoulvdberge.refinedstorage.api.util.StackListResult; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.IStorage; +import com.refinedmods.refinedstorage.api.storage.IStorageProvider; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCache; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCacheListener; +import com.refinedmods.refinedstorage.api.storage.cache.InvalidateCause; +import com.refinedmods.refinedstorage.api.util.IStackList; +import com.refinedmods.refinedstorage.api.util.StackListResult; +import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraftforge.fluids.FluidStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/ItemStorageCache.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/ItemStorageCache.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/ItemStorageCache.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/ItemStorageCache.java index fccbe77ad..00774a0dd 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/ItemStorageCache.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/ItemStorageCache.java @@ -1,15 +1,15 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.cache; +package com.refinedmods.refinedstorage.apiimpl.storage.cache; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.IStorage; -import com.raoulvdberge.refinedstorage.api.storage.IStorageProvider; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; -import com.raoulvdberge.refinedstorage.api.storage.cache.InvalidateCause; -import com.raoulvdberge.refinedstorage.api.util.IStackList; -import com.raoulvdberge.refinedstorage.api.util.StackListResult; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.IStorage; +import com.refinedmods.refinedstorage.api.storage.IStorageProvider; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCache; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCacheListener; +import com.refinedmods.refinedstorage.api.storage.cache.InvalidateCause; +import com.refinedmods.refinedstorage.api.util.IStackList; +import com.refinedmods.refinedstorage.api.util.StackListResult; +import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraft.item.ItemStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/PortableFluidStorageCache.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/PortableFluidStorageCache.java similarity index 79% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/PortableFluidStorageCache.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/PortableFluidStorageCache.java index 29f294e28..180632d08 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/PortableFluidStorageCache.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/PortableFluidStorageCache.java @@ -1,13 +1,13 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.cache; +package com.refinedmods.refinedstorage.apiimpl.storage.cache; -import com.raoulvdberge.refinedstorage.api.storage.IStorage; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; -import com.raoulvdberge.refinedstorage.api.storage.cache.InvalidateCause; -import com.raoulvdberge.refinedstorage.api.util.IStackList; -import com.raoulvdberge.refinedstorage.api.util.StackListResult; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; +import com.refinedmods.refinedstorage.api.storage.IStorage; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCache; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCacheListener; +import com.refinedmods.refinedstorage.api.storage.cache.InvalidateCause; +import com.refinedmods.refinedstorage.api.util.IStackList; +import com.refinedmods.refinedstorage.api.util.StackListResult; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid; import net.minecraftforge.fluids.FluidStack; import javax.annotation.Nonnull; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/PortableItemStorageCache.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/PortableItemStorageCache.java similarity index 79% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/PortableItemStorageCache.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/PortableItemStorageCache.java index 1120fcb4a..f6e368731 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/PortableItemStorageCache.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/PortableItemStorageCache.java @@ -1,13 +1,13 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.cache; +package com.refinedmods.refinedstorage.apiimpl.storage.cache; -import com.raoulvdberge.refinedstorage.api.storage.IStorage; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; -import com.raoulvdberge.refinedstorage.api.storage.cache.InvalidateCause; -import com.raoulvdberge.refinedstorage.api.util.IStackList; -import com.raoulvdberge.refinedstorage.api.util.StackListResult; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; +import com.refinedmods.refinedstorage.api.storage.IStorage; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCache; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCacheListener; +import com.refinedmods.refinedstorage.api.storage.cache.InvalidateCause; +import com.refinedmods.refinedstorage.api.util.IStackList; +import com.refinedmods.refinedstorage.api.util.StackListResult; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid; import net.minecraft.item.ItemStack; import javax.annotation.Nonnull; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/FluidGridStorageCacheListener.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/FluidGridStorageCacheListener.java similarity index 67% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/FluidGridStorageCacheListener.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/FluidGridStorageCacheListener.java index 5f2a359c7..a4d37ddcb 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/FluidGridStorageCacheListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/FluidGridStorageCacheListener.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener; +package com.refinedmods.refinedstorage.apiimpl.storage.cache.listener; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; -import com.raoulvdberge.refinedstorage.api.util.StackListResult; -import com.raoulvdberge.refinedstorage.network.grid.GridFluidDeltaMessage; -import com.raoulvdberge.refinedstorage.network.grid.GridFluidUpdateMessage; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCacheListener; +import com.refinedmods.refinedstorage.api.util.StackListResult; +import com.refinedmods.refinedstorage.network.grid.GridFluidDeltaMessage; +import com.refinedmods.refinedstorage.network.grid.GridFluidUpdateMessage; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/ItemGridStorageCacheListener.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/ItemGridStorageCacheListener.java similarity index 67% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/ItemGridStorageCacheListener.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/ItemGridStorageCacheListener.java index a07ab4029..92bdc9e71 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/ItemGridStorageCacheListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/ItemGridStorageCacheListener.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener; +package com.refinedmods.refinedstorage.apiimpl.storage.cache.listener; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; -import com.raoulvdberge.refinedstorage.api.util.StackListResult; -import com.raoulvdberge.refinedstorage.network.grid.GridItemDeltaMessage; -import com.raoulvdberge.refinedstorage.network.grid.GridItemUpdateMessage; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCacheListener; +import com.refinedmods.refinedstorage.api.util.StackListResult; +import com.refinedmods.refinedstorage.network.grid.GridItemDeltaMessage; +import com.refinedmods.refinedstorage.network.grid.GridItemUpdateMessage; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/PortableFluidGridStorageCacheListener.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/PortableFluidGridStorageCacheListener.java similarity index 70% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/PortableFluidGridStorageCacheListener.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/PortableFluidGridStorageCacheListener.java index 5222f5279..29d165e88 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/PortableFluidGridStorageCacheListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/PortableFluidGridStorageCacheListener.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener; +package com.refinedmods.refinedstorage.apiimpl.storage.cache.listener; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; -import com.raoulvdberge.refinedstorage.api.util.StackListResult; -import com.raoulvdberge.refinedstorage.network.grid.PortableGridFluidDeltaMessage; -import com.raoulvdberge.refinedstorage.network.grid.PortableGridFluidUpdateMessage; -import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCacheListener; +import com.refinedmods.refinedstorage.api.util.StackListResult; +import com.refinedmods.refinedstorage.network.grid.PortableGridFluidDeltaMessage; +import com.refinedmods.refinedstorage.network.grid.PortableGridFluidUpdateMessage; +import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/PortableItemGridStorageCacheListener.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/PortableItemGridStorageCacheListener.java similarity index 69% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/PortableItemGridStorageCacheListener.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/PortableItemGridStorageCacheListener.java index 4e3d8419b..abf547e01 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/PortableItemGridStorageCacheListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/PortableItemGridStorageCacheListener.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener; +package com.refinedmods.refinedstorage.apiimpl.storage.cache.listener; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; -import com.raoulvdberge.refinedstorage.api.util.StackListResult; -import com.raoulvdberge.refinedstorage.network.grid.PortableGridItemDeltaMessage; -import com.raoulvdberge.refinedstorage.network.grid.PortableGridItemUpdateMessage; -import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCacheListener; +import com.refinedmods.refinedstorage.api.util.StackListResult; +import com.refinedmods.refinedstorage.network.grid.PortableGridItemDeltaMessage; +import com.refinedmods.refinedstorage.network.grid.PortableGridItemUpdateMessage; +import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java index 7a2ec9bee..0674016d6 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java @@ -1,15 +1,15 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.disk; +package com.refinedmods.refinedstorage.apiimpl.storage.disk; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskListener; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.factory.FluidStorageDiskFactory; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskListener; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.storage.disk.factory.FluidStorageDiskFactory; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.fluid.Fluid; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java index 6a0673e4b..26881950b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java @@ -1,15 +1,15 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.disk; +package com.refinedmods.refinedstorage.apiimpl.storage.disk; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskListener; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.factory.ItemStorageDiskFactory; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskListener; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.storage.disk.factory.ItemStorageDiskFactory; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/PortableFluidStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/PortableFluidStorageDisk.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/PortableFluidStorageDisk.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/PortableFluidStorageDisk.java index d1e533e99..8096993d6 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/PortableFluidStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/PortableFluidStorageDisk.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.disk; +package com.refinedmods.refinedstorage.apiimpl.storage.disk; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskListener; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskListener; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/PortableItemStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/PortableItemStorageDisk.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/PortableItemStorageDisk.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/PortableItemStorageDisk.java index 668280a35..fb1818da4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/PortableItemStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/PortableItemStorageDisk.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.disk; +package com.refinedmods.refinedstorage.apiimpl.storage.disk; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskListener; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskListener; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java index 682412b1f..334d6b09a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.disk; +package com.refinedmods.refinedstorage.apiimpl.storage.disk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskFactory; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskManager; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskFactory; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskManager; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskProvider; +import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskRegistry.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskRegistry.java similarity index 71% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskRegistry.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskRegistry.java index cb434d469..3f19d9f2f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskRegistry.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskRegistry.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.disk; +package com.refinedmods.refinedstorage.apiimpl.storage.disk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskFactory; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskRegistry; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskFactory; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskRegistry; import net.minecraft.util.ResourceLocation; import javax.annotation.Nullable; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskSync.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskSync.java similarity index 72% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskSync.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskSync.java index 600f00517..a5d6b0c81 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskSync.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskSync.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.disk; +package com.refinedmods.refinedstorage.apiimpl.storage.disk; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskSync; -import com.raoulvdberge.refinedstorage.api.storage.disk.StorageDiskSyncData; -import com.raoulvdberge.refinedstorage.network.disk.StorageDiskSizeRequestMessage; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskSync; +import com.refinedmods.refinedstorage.api.storage.disk.StorageDiskSyncData; +import com.refinedmods.refinedstorage.network.disk.StorageDiskSizeRequestMessage; import javax.annotation.Nullable; import java.util.HashMap; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/factory/FluidStorageDiskFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/FluidStorageDiskFactory.java similarity index 77% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/factory/FluidStorageDiskFactory.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/FluidStorageDiskFactory.java index 1ea0d28e9..e2871f864 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/factory/FluidStorageDiskFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/FluidStorageDiskFactory.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.disk.factory; +package com.refinedmods.refinedstorage.apiimpl.storage.disk.factory; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskFactory; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.FluidStorageDisk; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskFactory; +import com.refinedmods.refinedstorage.apiimpl.storage.disk.FluidStorageDisk; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/factory/ItemStorageDiskFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/ItemStorageDiskFactory.java similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/factory/ItemStorageDiskFactory.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/ItemStorageDiskFactory.java index 50054d0fd..2fef34391 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/factory/ItemStorageDiskFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/ItemStorageDiskFactory.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.disk.factory; +package com.refinedmods.refinedstorage.apiimpl.storage.disk.factory; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskFactory; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.ItemStorageDisk; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskFactory; +import com.refinedmods.refinedstorage.apiimpl.storage.disk.ItemStorageDisk; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorage.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorage.java similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorage.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorage.java index c5a09fc47..fcd06b49f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorage.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorage.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.externalstorage; +package com.refinedmods.refinedstorage.apiimpl.storage.externalstorage; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStorage; -import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStorageContext; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorage; +import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageContext; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageCache.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageCache.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageCache.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageCache.java index 7c485e491..c75f8e416 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageCache.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageCache.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.externalstorage; +package com.refinedmods.refinedstorage.apiimpl.storage.externalstorage; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageProvider.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageProvider.java similarity index 65% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageProvider.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageProvider.java index 835cf67e1..9ec9bdc79 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageProvider.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.externalstorage; +package com.refinedmods.refinedstorage.apiimpl.storage.externalstorage; -import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStorage; -import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStorageContext; -import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStorageProvider; -import com.raoulvdberge.refinedstorage.tile.FluidInterfaceTile; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorage; +import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageContext; +import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageProvider; +import com.refinedmods.refinedstorage.tile.FluidInterfaceTile; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorage.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorage.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorage.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorage.java index f5b3bae38..a725c1011 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorage.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorage.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.externalstorage; +package com.refinedmods.refinedstorage.apiimpl.storage.externalstorage; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStorage; -import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStorageContext; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorage; +import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageContext; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorageCache.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorageCache.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorageCache.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorageCache.java index c4c2cae32..a23d6d316 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorageCache.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorageCache.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.externalstorage; +package com.refinedmods.refinedstorage.apiimpl.storage.externalstorage; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorageProvider.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorageProvider.java similarity index 60% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorageProvider.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorageProvider.java index 1024cd87c..17205302d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorageProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorageProvider.java @@ -1,13 +1,13 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.externalstorage; +package com.refinedmods.refinedstorage.apiimpl.storage.externalstorage; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.storage.IStorageProvider; -import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStorage; -import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStorageContext; -import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStorageProvider; -import com.raoulvdberge.refinedstorage.tile.InterfaceTile; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.storage.IStorageProvider; +import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorage; +import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageContext; +import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageProvider; +import com.refinedmods.refinedstorage.tile.InterfaceTile; +import com.refinedmods.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/tracker/FluidStorageTracker.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/FluidStorageTracker.java similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/tracker/FluidStorageTracker.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/FluidStorageTracker.java index 4e7223a4e..e3c0e7bc0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/tracker/FluidStorageTracker.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/FluidStorageTracker.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.tracker; +package com.refinedmods.refinedstorage.apiimpl.storage.tracker; -import com.raoulvdberge.refinedstorage.api.storage.tracker.IStorageTracker; -import com.raoulvdberge.refinedstorage.api.storage.tracker.StorageTrackerEntry; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.api.storage.tracker.IStorageTracker; +import com.refinedmods.refinedstorage.api.storage.tracker.StorageTrackerEntry; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/tracker/ItemStorageTracker.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/ItemStorageTracker.java similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/tracker/ItemStorageTracker.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/ItemStorageTracker.java index cd907e1b4..7b1243b0b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/tracker/ItemStorageTracker.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/ItemStorageTracker.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.tracker; +package com.refinedmods.refinedstorage.apiimpl.storage.tracker; -import com.raoulvdberge.refinedstorage.api.storage.tracker.IStorageTracker; -import com.raoulvdberge.refinedstorage.api.storage.tracker.StorageTrackerEntry; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.api.storage.tracker.IStorageTracker; +import com.refinedmods.refinedstorage.api.storage.tracker.StorageTrackerEntry; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/Comparer.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/Comparer.java old mode 100755 new mode 100644 similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/Comparer.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/util/Comparer.java index 4b8626357..8ae35de1e --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/Comparer.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/Comparer.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.apiimpl.util; +package com.refinedmods.refinedstorage.apiimpl.util; -import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.api.util.IComparer; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FluidFilter.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/FluidFilter.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FluidFilter.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/util/FluidFilter.java index 96e0fe596..49f6ced7f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FluidFilter.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/FluidFilter.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.apiimpl.util; +package com.refinedmods.refinedstorage.apiimpl.util; -import com.raoulvdberge.refinedstorage.api.util.IFilter; +import com.refinedmods.refinedstorage.api.util.IFilter; import net.minecraftforge.fluids.FluidStack; public class FluidFilter implements IFilter { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FluidStackList.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/FluidStackList.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FluidStackList.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/util/FluidStackList.java index 8ff2b8282..f5e82f1fa 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FluidStackList.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/FluidStackList.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.apiimpl.util; +package com.refinedmods.refinedstorage.apiimpl.util; import com.google.common.collect.ArrayListMultimap; -import com.raoulvdberge.refinedstorage.api.util.IStackList; -import com.raoulvdberge.refinedstorage.api.util.StackListEntry; -import com.raoulvdberge.refinedstorage.api.util.StackListResult; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.api.util.IStackList; +import com.refinedmods.refinedstorage.api.util.StackListEntry; +import com.refinedmods.refinedstorage.api.util.StackListResult; +import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraft.fluid.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemFilter.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/ItemFilter.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemFilter.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/util/ItemFilter.java index 19d698ac3..8a8837574 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemFilter.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/ItemFilter.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.apiimpl.util; +package com.refinedmods.refinedstorage.apiimpl.util; -import com.raoulvdberge.refinedstorage.api.util.IFilter; +import com.refinedmods.refinedstorage.api.util.IFilter; import net.minecraft.item.ItemStack; public class ItemFilter implements IFilter { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackList.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/ItemStackList.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackList.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/util/ItemStackList.java index 26e1f9d0e..9d966c2fa 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackList.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/ItemStackList.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.apiimpl.util; +package com.refinedmods.refinedstorage.apiimpl.util; import com.google.common.collect.ArrayListMultimap; -import com.raoulvdberge.refinedstorage.api.util.IStackList; -import com.raoulvdberge.refinedstorage.api.util.StackListEntry; -import com.raoulvdberge.refinedstorage.api.util.StackListResult; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.api.util.IStackList; +import com.refinedmods.refinedstorage.api.util.StackListEntry; +import com.refinedmods.refinedstorage.api.util.StackListResult; +import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.items.ItemHandlerHelper; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/QuantityFormatter.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/QuantityFormatter.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/QuantityFormatter.java rename to src/main/java/com/refinedmods/refinedstorage/apiimpl/util/QuantityFormatter.java index 7b4a6aa53..3ce1dd946 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/QuantityFormatter.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/QuantityFormatter.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.apiimpl.util; +package com.refinedmods.refinedstorage.apiimpl.util; -import com.raoulvdberge.refinedstorage.api.util.IQuantityFormatter; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.api.util.IQuantityFormatter; +import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraftforge.fluids.FluidAttributes; import java.math.RoundingMode; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BaseBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java similarity index 97% rename from src/main/java/com/raoulvdberge/refinedstorage/block/BaseBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java index 0eddab93d..e7c559f41 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BaseBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDirection.java b/src/main/java/com/refinedmods/refinedstorage/block/BlockDirection.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/block/BlockDirection.java rename to src/main/java/com/refinedmods/refinedstorage/block/BlockDirection.java index f98efe8a2..b2c21b7f2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDirection.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/BlockDirection.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.util.DirectionUtils; +import com.refinedmods.refinedstorage.util.DirectionUtils; import net.minecraft.entity.LivingEntity; import net.minecraft.state.DirectionProperty; import net.minecraft.util.Direction; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockListener.java b/src/main/java/com/refinedmods/refinedstorage/block/BlockListener.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/block/BlockListener.java rename to src/main/java/com/refinedmods/refinedstorage/block/BlockListener.java index a5e28356f..96e5d8315 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/BlockListener.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/CableBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java similarity index 96% rename from src/main/java/com/raoulvdberge/refinedstorage/block/CableBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java index 6049e4d9d..d0aa2d26c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/CableBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.capability.NetworkNodeProxyCapability; -import com.raoulvdberge.refinedstorage.tile.CableTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.capability.NetworkNodeProxyCapability; +import com.refinedmods.refinedstorage.tile.CableTile; +import com.refinedmods.refinedstorage.util.BlockUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.IWaterLoggable; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/ConstructorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/block/ConstructorBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java index 144899761..92bf39288 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/ConstructorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.ConstructorContainer; -import com.raoulvdberge.refinedstorage.container.factory.PositionalTileContainerProvider; -import com.raoulvdberge.refinedstorage.tile.ConstructorTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.CollisionUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.ConstructorContainer; +import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; +import com.refinedmods.refinedstorage.tile.ConstructorTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.CollisionUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/ControllerBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/block/ControllerBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java index 058744511..b2331ae4b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/ControllerBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.NetworkType; -import com.raoulvdberge.refinedstorage.container.ControllerContainer; -import com.raoulvdberge.refinedstorage.tile.ControllerTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.NetworkType; +import com.refinedmods.refinedstorage.container.ControllerContainer; +import com.refinedmods.refinedstorage.tile.ControllerTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/CrafterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/block/CrafterBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java index 1d65770ba..0848af43c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/CrafterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.container.CrafterContainer; -import com.raoulvdberge.refinedstorage.container.factory.PositionalTileContainerProvider; -import com.raoulvdberge.refinedstorage.tile.CrafterTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.container.CrafterContainer; +import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; +import com.refinedmods.refinedstorage.tile.CrafterTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/CrafterManagerBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/CrafterManagerBlock.java similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/block/CrafterManagerBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/CrafterManagerBlock.java index 0bb98b1cd..a57685d94 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/CrafterManagerBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/CrafterManagerBlock.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.container.factory.CrafterManagerContainerProvider; -import com.raoulvdberge.refinedstorage.tile.CrafterManagerTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.container.factory.CrafterManagerContainerProvider; +import com.refinedmods.refinedstorage.tile.CrafterManagerTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/CraftingMonitorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java similarity index 78% rename from src/main/java/com/raoulvdberge/refinedstorage/block/CraftingMonitorBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java index a07140f36..ce5ac9e85 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/CraftingMonitorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.container.factory.CraftingMonitorContainerProvider; -import com.raoulvdberge.refinedstorage.tile.craftingmonitor.CraftingMonitorTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.container.factory.CraftingMonitorContainerProvider; +import com.refinedmods.refinedstorage.tile.craftingmonitor.CraftingMonitorTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/DestructorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/block/DestructorBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java index b3da5e29d..6f1c5d243 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/DestructorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.DestructorContainer; -import com.raoulvdberge.refinedstorage.container.factory.PositionalTileContainerProvider; -import com.raoulvdberge.refinedstorage.tile.DestructorTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.CollisionUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.DestructorContainer; +import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; +import com.refinedmods.refinedstorage.tile.DestructorTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.CollisionUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/DetectorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/block/DetectorBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java index 14038940f..68b1200ca 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/DetectorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.DetectorContainer; -import com.raoulvdberge.refinedstorage.container.factory.PositionalTileContainerProvider; -import com.raoulvdberge.refinedstorage.tile.DetectorTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.DetectorContainer; +import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; +import com.refinedmods.refinedstorage.tile.DetectorTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/DiskDriveBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/block/DiskDriveBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java index ef84d336f..cd6155fe3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/DiskDriveBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.DiskDriveContainer; -import com.raoulvdberge.refinedstorage.container.factory.PositionalTileContainerProvider; -import com.raoulvdberge.refinedstorage.tile.DiskDriveTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.DiskDriveContainer; +import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; +import com.refinedmods.refinedstorage.tile.DiskDriveTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/DiskManipulatorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/block/DiskManipulatorBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java index 7609adc21..ae8016ebf 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/DiskManipulatorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.DiskManipulatorContainer; -import com.raoulvdberge.refinedstorage.container.factory.PositionalTileContainerProvider; -import com.raoulvdberge.refinedstorage.tile.DiskManipulatorTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.DiskManipulatorContainer; +import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; +import com.refinedmods.refinedstorage.tile.DiskManipulatorTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/ExporterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/block/ExporterBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java index 522fb5f98..85d04b412 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/ExporterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.ExporterContainer; -import com.raoulvdberge.refinedstorage.container.factory.PositionalTileContainerProvider; -import com.raoulvdberge.refinedstorage.tile.ExporterTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.CollisionUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.ExporterContainer; +import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; +import com.refinedmods.refinedstorage.tile.ExporterTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.CollisionUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/ExternalStorageBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/block/ExternalStorageBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java index ad69ed3b6..8abb48f03 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/ExternalStorageBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java @@ -1,15 +1,15 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.storage.cache.InvalidateCause; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.ExternalStorageNetworkNode; -import com.raoulvdberge.refinedstorage.container.ExternalStorageContainer; -import com.raoulvdberge.refinedstorage.container.factory.PositionalTileContainerProvider; -import com.raoulvdberge.refinedstorage.tile.ExternalStorageTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.CollisionUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.storage.cache.InvalidateCause; +import com.refinedmods.refinedstorage.apiimpl.network.node.ExternalStorageNetworkNode; +import com.refinedmods.refinedstorage.container.ExternalStorageContainer; +import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; +import com.refinedmods.refinedstorage.tile.ExternalStorageTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.CollisionUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/FluidInterfaceBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java similarity index 78% rename from src/main/java/com/raoulvdberge/refinedstorage/block/FluidInterfaceBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java index 212e611f1..c9593b812 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/FluidInterfaceBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.container.FluidInterfaceContainer; -import com.raoulvdberge.refinedstorage.container.factory.PositionalTileContainerProvider; -import com.raoulvdberge.refinedstorage.tile.FluidInterfaceTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.container.FluidInterfaceContainer; +import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; +import com.refinedmods.refinedstorage.tile.FluidInterfaceTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/FluidStorageBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/block/FluidStorageBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java index 08aa7a813..3afee5007 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/FluidStorageBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java @@ -1,13 +1,13 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.FluidStorageNetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.storage.FluidStorageType; -import com.raoulvdberge.refinedstorage.container.FluidStorageContainer; -import com.raoulvdberge.refinedstorage.container.factory.PositionalTileContainerProvider; -import com.raoulvdberge.refinedstorage.tile.FluidStorageTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.apiimpl.network.node.storage.FluidStorageNetworkNode; +import com.refinedmods.refinedstorage.apiimpl.storage.FluidStorageType; +import com.refinedmods.refinedstorage.container.FluidStorageContainer; +import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; +import com.refinedmods.refinedstorage.tile.FluidStorageTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/GridBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/GridBlock.java similarity index 77% rename from src/main/java/com/raoulvdberge/refinedstorage/block/GridBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/GridBlock.java index d587eb7b3..6128967f7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/GridBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/GridBlock.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.grid.GridType; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.network.grid.factory.GridBlockGridFactory; -import com.raoulvdberge.refinedstorage.tile.grid.GridTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.grid.GridType; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.network.grid.factory.GridBlockGridFactory; +import com.refinedmods.refinedstorage.tile.grid.GridTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/ImporterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/block/ImporterBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java index 678130dbf..6c18ea2a7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/ImporterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.ImporterContainer; -import com.raoulvdberge.refinedstorage.container.factory.PositionalTileContainerProvider; -import com.raoulvdberge.refinedstorage.tile.ImporterTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.CollisionUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.ImporterContainer; +import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; +import com.refinedmods.refinedstorage.tile.ImporterTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.CollisionUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/InterfaceBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java similarity index 78% rename from src/main/java/com/raoulvdberge/refinedstorage/block/InterfaceBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java index 75bec1f2a..af441013d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/InterfaceBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.container.InterfaceContainer; -import com.raoulvdberge.refinedstorage.container.factory.PositionalTileContainerProvider; -import com.raoulvdberge.refinedstorage.tile.InterfaceTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.container.InterfaceContainer; +import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; +import com.refinedmods.refinedstorage.tile.InterfaceTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/MachineCasingBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/MachineCasingBlock.java similarity index 58% rename from src/main/java/com/raoulvdberge/refinedstorage/block/MachineCasingBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/MachineCasingBlock.java index 80bafc918..254a3be30 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/MachineCasingBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/MachineCasingBlock.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.util.BlockUtils; public class MachineCasingBlock extends BaseBlock { public MachineCasingBlock() { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/NetworkNodeBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/block/NetworkNodeBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java index 493efe10e..28de1597a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/NetworkNodeBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode; -import com.raoulvdberge.refinedstorage.tile.NetworkNodeTile; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.network.node.INetworkNodeProxy; +import com.refinedmods.refinedstorage.apiimpl.network.node.NetworkNode; +import com.refinedmods.refinedstorage.tile.NetworkNodeTile; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.inventory.InventoryHelper; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/NetworkReceiverBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/NetworkReceiverBlock.java similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/block/NetworkReceiverBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/NetworkReceiverBlock.java index 9bad66dc7..e63a54c3d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/NetworkReceiverBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/NetworkReceiverBlock.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.tile.NetworkReceiverTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.tile.NetworkReceiverTile; +import com.refinedmods.refinedstorage.util.BlockUtils; import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockReader; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/NetworkTransmitterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/block/NetworkTransmitterBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java index fbef8b1f8..2446e62a0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/NetworkTransmitterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.NetworkTransmitterContainer; -import com.raoulvdberge.refinedstorage.container.factory.PositionalTileContainerProvider; -import com.raoulvdberge.refinedstorage.tile.NetworkTransmitterTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.NetworkTransmitterContainer; +import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; +import com.refinedmods.refinedstorage.tile.NetworkTransmitterTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/PortableGridBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/PortableGridBlock.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/block/PortableGridBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/PortableGridBlock.java index 04f2d6a8d..4ed803ced 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/PortableGridBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/PortableGridBlock.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.network.grid.factory.PortableGridBlockGridFactory; -import com.raoulvdberge.refinedstorage.item.blockitem.PortableGridBlockItem; -import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGridDiskState; -import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGridTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.network.grid.factory.PortableGridBlockGridFactory; +import com.refinedmods.refinedstorage.item.blockitem.PortableGridBlockItem; +import com.refinedmods.refinedstorage.tile.grid.portable.PortableGridDiskState; +import com.refinedmods.refinedstorage.tile.grid.portable.PortableGridTile; +import com.refinedmods.refinedstorage.util.BlockUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/QuartzEnrichedIronBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/QuartzEnrichedIronBlock.java similarity index 60% rename from src/main/java/com/raoulvdberge/refinedstorage/block/QuartzEnrichedIronBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/QuartzEnrichedIronBlock.java index e7a1faf9d..a49a14322 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/QuartzEnrichedIronBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/QuartzEnrichedIronBlock.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.util.BlockUtils; public class QuartzEnrichedIronBlock extends BaseBlock { public QuartzEnrichedIronBlock() { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/RelayBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/block/RelayBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java index f5b632bf1..bf8ee611c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/RelayBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.RelayContainer; -import com.raoulvdberge.refinedstorage.container.factory.PositionalTileContainerProvider; -import com.raoulvdberge.refinedstorage.tile.RelayTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.RelayContainer; +import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; +import com.refinedmods.refinedstorage.tile.RelayTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/SecurityManagerBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/block/SecurityManagerBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java index f2b8f794d..cce194bfe 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/SecurityManagerBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.container.SecurityManagerContainer; -import com.raoulvdberge.refinedstorage.container.factory.PositionalTileContainerProvider; -import com.raoulvdberge.refinedstorage.tile.SecurityManagerTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.container.SecurityManagerContainer; +import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; +import com.refinedmods.refinedstorage.tile.SecurityManagerTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/StorageBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/block/StorageBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java index 31646cde5..ab37ee741 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/StorageBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java @@ -1,13 +1,13 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.storage.ItemStorageType; -import com.raoulvdberge.refinedstorage.container.StorageContainer; -import com.raoulvdberge.refinedstorage.container.factory.PositionalTileContainerProvider; -import com.raoulvdberge.refinedstorage.tile.StorageTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode; +import com.refinedmods.refinedstorage.apiimpl.storage.ItemStorageType; +import com.refinedmods.refinedstorage.container.StorageContainer; +import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; +import com.refinedmods.refinedstorage.tile.StorageTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/StorageMonitorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java similarity index 84% rename from src/main/java/com/raoulvdberge/refinedstorage/block/StorageMonitorBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java index 837949d9c..139e0d55e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/StorageMonitorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java @@ -1,13 +1,13 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.StorageMonitorNetworkNode; -import com.raoulvdberge.refinedstorage.container.StorageMonitorContainer; -import com.raoulvdberge.refinedstorage.container.factory.PositionalTileContainerProvider; -import com.raoulvdberge.refinedstorage.tile.StorageMonitorTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.apiimpl.network.node.StorageMonitorNetworkNode; +import com.refinedmods.refinedstorage.container.StorageMonitorContainer; +import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; +import com.refinedmods.refinedstorage.tile.StorageMonitorTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/WirelessTransmitterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java similarity index 70% rename from src/main/java/com/raoulvdberge/refinedstorage/block/WirelessTransmitterBlock.java rename to src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java index 6c4ac54ff..a4751c987 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/WirelessTransmitterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java @@ -1,12 +1,11 @@ -package com.raoulvdberge.refinedstorage.block; +package com.refinedmods.refinedstorage.block; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.WirelessTransmitterContainer; -import com.raoulvdberge.refinedstorage.container.factory.PositionalTileContainerProvider; -import com.raoulvdberge.refinedstorage.tile.WirelessTransmitterTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; -import net.minecraft.block.Block; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.WirelessTransmitterContainer; +import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; +import com.refinedmods.refinedstorage.tile.WirelessTransmitterTile; +import com.refinedmods.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; @@ -26,12 +25,12 @@ import net.minecraftforge.fml.network.NetworkHooks; import javax.annotation.Nullable; public class WirelessTransmitterBlock extends NetworkNodeBlock { - private static final VoxelShape SHAPE_DOWN = Block.makeCuboidShape(6.0D, 0.0D, 6.0D, 10.0D, 10.0D, 10.0D); - private static final VoxelShape SHAPE_UP = Block.makeCuboidShape(6.0D, 6.0D, 6.0D, 10.0D, 16.0D, 10.0D); - private static final VoxelShape SHAPE_EAST = Block.makeCuboidShape(6.0D, 6.0D, 6.0D, 16.0D, 10.0D, 10.0D); - private static final VoxelShape SHAPE_WEST = Block.makeCuboidShape(0.0D, 6.0D, 6.0D, 10.0D, 10.0D, 10.0D); - private static final VoxelShape SHAPE_NORTH = Block.makeCuboidShape(6.0D, 6.0D, 0.0D, 10.0D, 10.0D, 10.0D); - private static final VoxelShape SHAPE_SOUTH = Block.makeCuboidShape(6.0D, 6.0D, 6.0D, 10.0D, 10.0D, 16.0D); + private static final VoxelShape SHAPE_DOWN = makeCuboidShape(6.0D, 0.0D, 6.0D, 10.0D, 10.0D, 10.0D); + private static final VoxelShape SHAPE_UP = makeCuboidShape(6.0D, 6.0D, 6.0D, 10.0D, 16.0D, 10.0D); + private static final VoxelShape SHAPE_EAST = makeCuboidShape(6.0D, 6.0D, 6.0D, 16.0D, 10.0D, 10.0D); + private static final VoxelShape SHAPE_WEST = makeCuboidShape(0.0D, 6.0D, 6.0D, 10.0D, 10.0D, 10.0D); + private static final VoxelShape SHAPE_NORTH = makeCuboidShape(6.0D, 6.0D, 0.0D, 10.0D, 10.0D, 10.0D); + private static final VoxelShape SHAPE_SOUTH = makeCuboidShape(6.0D, 6.0D, 6.0D, 10.0D, 10.0D, 16.0D); public WirelessTransmitterBlock() { super(BlockUtils.DEFAULT_ROCK_PROPERTIES); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/capability/NetworkNodeProxyCapability.java b/src/main/java/com/refinedmods/refinedstorage/capability/NetworkNodeProxyCapability.java similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/capability/NetworkNodeProxyCapability.java rename to src/main/java/com/refinedmods/refinedstorage/capability/NetworkNodeProxyCapability.java index 5eb5945d8..0bd94f7ce 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/capability/NetworkNodeProxyCapability.java +++ b/src/main/java/com/refinedmods/refinedstorage/capability/NetworkNodeProxyCapability.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.capability; +package com.refinedmods.refinedstorage.capability; import com.google.common.base.Preconditions; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.network.node.INetworkNodeProxy; import net.minecraft.nbt.INBT; import net.minecraft.util.Direction; import net.minecraftforge.common.capabilities.Capability; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/command/CommandCreateDisk.java b/src/main/java/com/refinedmods/refinedstorage/command/CommandCreateDisk.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/command/CommandCreateDisk.java rename to src/main/java/com/refinedmods/refinedstorage/command/CommandCreateDisk.java index a17d87bc7..38ec9e64b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/command/CommandCreateDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/CommandCreateDisk.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.command; +package com.refinedmods.refinedstorage.command; /* TODO -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskProvider; +import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/command/PatternDumpCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/PatternDumpCommand.java similarity index 96% rename from src/main/java/com/raoulvdberge/refinedstorage/command/PatternDumpCommand.java rename to src/main/java/com/refinedmods/refinedstorage/command/PatternDumpCommand.java index 6efc316f7..3fc15aeec 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/command/PatternDumpCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/PatternDumpCommand.java @@ -1,14 +1,14 @@ -package com.raoulvdberge.refinedstorage.command; +package com.refinedmods.refinedstorage.command; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.builder.ArgumentBuilder; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.AllowedTagList; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPattern; -import com.raoulvdberge.refinedstorage.item.PatternItem; -import com.raoulvdberge.refinedstorage.render.Styles; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.AllowedTagList; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.CraftingPattern; +import com.refinedmods.refinedstorage.item.PatternItem; +import com.refinedmods.refinedstorage.render.Styles; import net.minecraft.command.CommandSource; import net.minecraft.command.Commands; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/config/ClientConfig.java b/src/main/java/com/refinedmods/refinedstorage/config/ClientConfig.java similarity index 98% rename from src/main/java/com/raoulvdberge/refinedstorage/config/ClientConfig.java rename to src/main/java/com/refinedmods/refinedstorage/config/ClientConfig.java index 949a2afca..41840408d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/config/ClientConfig.java +++ b/src/main/java/com/refinedmods/refinedstorage/config/ClientConfig.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.config; +package com.refinedmods.refinedstorage.config; import net.minecraftforge.common.ForgeConfigSpec; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/config/ServerConfig.java b/src/main/java/com/refinedmods/refinedstorage/config/ServerConfig.java similarity index 99% rename from src/main/java/com/raoulvdberge/refinedstorage/config/ServerConfig.java rename to src/main/java/com/refinedmods/refinedstorage/config/ServerConfig.java index 9be546aa7..7fceb3c7a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/config/ServerConfig.java +++ b/src/main/java/com/refinedmods/refinedstorage/config/ServerConfig.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.config; +package com.refinedmods.refinedstorage.config; import net.minecraftforge.common.ForgeConfigSpec; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/AlternativesContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/AlternativesContainer.java similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/container/AlternativesContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/AlternativesContainer.java index 6f8963cb1..0aca23310 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/AlternativesContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/AlternativesContainer.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/AmountContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/AmountContainer.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/container/AmountContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/AmountContainer.java index 80fba7c6a..e10f03aed 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/AmountContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/AmountContainer.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.container.slot.DisabledSlot; +import com.refinedmods.refinedstorage.container.slot.DisabledSlot; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.items.ItemHandlerHelper; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/BaseContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/container/BaseContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java index dd492a3ad..dfbd9f826 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/BaseContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java @@ -1,16 +1,16 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.legacy.LegacyDisabledSlot; -import com.raoulvdberge.refinedstorage.container.slot.legacy.LegacyFilterSlot; -import com.raoulvdberge.refinedstorage.container.transfer.TransferManager; -import com.raoulvdberge.refinedstorage.network.FluidFilterSlotUpdateMessage; -import com.raoulvdberge.refinedstorage.tile.BaseTile; -import com.raoulvdberge.refinedstorage.tile.data.TileDataWatcher; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; +import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.refinedmods.refinedstorage.container.slot.legacy.LegacyDisabledSlot; +import com.refinedmods.refinedstorage.container.slot.legacy.LegacyFilterSlot; +import com.refinedmods.refinedstorage.container.transfer.TransferManager; +import com.refinedmods.refinedstorage.network.FluidFilterSlotUpdateMessage; +import com.refinedmods.refinedstorage.tile.BaseTile; +import com.refinedmods.refinedstorage.tile.data.TileDataWatcher; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.ClickType; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ConstructorContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/ConstructorContainer.java similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ConstructorContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/ConstructorContainer.java index d061443c1..6e67b2e3e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ConstructorContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/ConstructorContainer.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; -import com.raoulvdberge.refinedstorage.tile.ConstructorTile; -import com.raoulvdberge.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; +import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.refinedmods.refinedstorage.tile.ConstructorTile; +import com.refinedmods.refinedstorage.tile.config.IType; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ControllerContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/ControllerContainer.java similarity index 65% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ControllerContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/ControllerContainer.java index 6b47ed750..b505e49a5 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ControllerContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/ControllerContainer.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.tile.ControllerTile; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.tile.ControllerTile; import net.minecraft.entity.player.PlayerEntity; public class ControllerContainer extends BaseContainer { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/CrafterContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/CrafterContainer.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/container/CrafterContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/CrafterContainer.java index d76adbbd5..eb4f97937 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/CrafterContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/CrafterContainer.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.tile.CrafterTile; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.tile.CrafterTile; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/CrafterManagerContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainer.java similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/container/CrafterManagerContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainer.java index 1adc8472a..c4f1e7091 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/CrafterManagerContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainer.java @@ -1,17 +1,17 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPattern; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.CrafterManagerNetworkNode; -import com.raoulvdberge.refinedstorage.container.slot.CrafterManagerSlot; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.validator.PatternItemValidator; -import com.raoulvdberge.refinedstorage.item.PatternItem; -import com.raoulvdberge.refinedstorage.screen.IScreenInfoProvider; -import com.raoulvdberge.refinedstorage.screen.grid.filtering.GridFilterParser; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; -import com.raoulvdberge.refinedstorage.screen.grid.stack.ItemGridStack; -import com.raoulvdberge.refinedstorage.tile.CrafterManagerTile; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.CraftingPattern; +import com.refinedmods.refinedstorage.apiimpl.network.node.CrafterManagerNetworkNode; +import com.refinedmods.refinedstorage.container.slot.CrafterManagerSlot; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.item.validator.PatternItemValidator; +import com.refinedmods.refinedstorage.item.PatternItem; +import com.refinedmods.refinedstorage.screen.IScreenInfoProvider; +import com.refinedmods.refinedstorage.screen.grid.filtering.GridFilterParser; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.screen.grid.stack.ItemGridStack; +import com.refinedmods.refinedstorage.tile.CrafterManagerTile; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/CraftingMonitorContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainer.java similarity index 84% rename from src/main/java/com/raoulvdberge/refinedstorage/container/CraftingMonitorContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainer.java index 90d649cf7..2468ebb98 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/CraftingMonitorContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainer.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingManager; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorListener; -import com.raoulvdberge.refinedstorage.network.craftingmonitor.CraftingMonitorUpdateMessage; -import com.raoulvdberge.refinedstorage.tile.craftingmonitor.CraftingMonitorTile; -import com.raoulvdberge.refinedstorage.tile.craftingmonitor.ICraftingMonitor; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingManager; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorListener; +import com.refinedmods.refinedstorage.network.craftingmonitor.CraftingMonitorUpdateMessage; +import com.refinedmods.refinedstorage.tile.craftingmonitor.CraftingMonitorTile; +import com.refinedmods.refinedstorage.tile.craftingmonitor.ICraftingMonitor; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.ContainerType; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/CraftingSettingsContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/CraftingSettingsContainer.java similarity index 65% rename from src/main/java/com/raoulvdberge/refinedstorage/container/CraftingSettingsContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/CraftingSettingsContainer.java index a3ceedd5a..58da6ad95 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/CraftingSettingsContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/CraftingSettingsContainer.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.container.slot.DisabledSlot; -import com.raoulvdberge.refinedstorage.container.slot.filter.DisabledFluidFilterSlot; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.screen.grid.stack.FluidGridStack; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; -import com.raoulvdberge.refinedstorage.screen.grid.stack.ItemGridStack; +import com.refinedmods.refinedstorage.container.slot.DisabledSlot; +import com.refinedmods.refinedstorage.container.slot.filter.DisabledFluidFilterSlot; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.screen.grid.stack.FluidGridStack; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.screen.grid.stack.ItemGridStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.ItemStackHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/DestructorContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/DestructorContainer.java similarity index 76% rename from src/main/java/com/raoulvdberge/refinedstorage/container/DestructorContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/DestructorContainer.java index f11fa3803..731d3b0c1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/DestructorContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/DestructorContainer.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; -import com.raoulvdberge.refinedstorage.tile.DestructorTile; -import com.raoulvdberge.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; +import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.refinedmods.refinedstorage.tile.DestructorTile; +import com.refinedmods.refinedstorage.tile.config.IType; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/DetectorContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/DetectorContainer.java similarity index 67% rename from src/main/java/com/raoulvdberge/refinedstorage/container/DetectorContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/DetectorContainer.java index c558f32dd..30328ef50 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/DetectorContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/DetectorContainer.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; -import com.raoulvdberge.refinedstorage.tile.DetectorTile; -import com.raoulvdberge.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; +import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.refinedmods.refinedstorage.tile.DetectorTile; +import com.refinedmods.refinedstorage.tile.config.IType; import net.minecraft.entity.player.PlayerEntity; public class DetectorContainer extends BaseContainer { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/DiskDriveContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/DiskDriveContainer.java similarity index 77% rename from src/main/java/com/raoulvdberge/refinedstorage/container/DiskDriveContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/DiskDriveContainer.java index 184264aec..4ed4d86d0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/DiskDriveContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/DiskDriveContainer.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; -import com.raoulvdberge.refinedstorage.tile.DiskDriveTile; -import com.raoulvdberge.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; +import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.refinedmods.refinedstorage.tile.DiskDriveTile; +import com.refinedmods.refinedstorage.tile.config.IType; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/DiskManipulatorContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/DiskManipulatorContainer.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/container/DiskManipulatorContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/DiskManipulatorContainer.java index 84da29923..12d5e0438 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/DiskManipulatorContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/DiskManipulatorContainer.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; -import com.raoulvdberge.refinedstorage.tile.DiskManipulatorTile; -import com.raoulvdberge.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; +import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.refinedmods.refinedstorage.tile.DiskManipulatorTile; +import com.refinedmods.refinedstorage.tile.config.IType; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ExporterContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/ExporterContainer.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ExporterContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/ExporterContainer.java index 46336d3b1..dc60acd7a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ExporterContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/ExporterContainer.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; -import com.raoulvdberge.refinedstorage.item.UpgradeItem; -import com.raoulvdberge.refinedstorage.tile.ExporterTile; -import com.raoulvdberge.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; +import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.refinedmods.refinedstorage.item.UpgradeItem; +import com.refinedmods.refinedstorage.tile.ExporterTile; +import com.refinedmods.refinedstorage.tile.config.IType; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ExternalStorageContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/ExternalStorageContainer.java similarity index 72% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ExternalStorageContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/ExternalStorageContainer.java index 7e91b6c36..e05db9360 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ExternalStorageContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/ExternalStorageContainer.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; -import com.raoulvdberge.refinedstorage.tile.ExternalStorageTile; -import com.raoulvdberge.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; +import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.refinedmods.refinedstorage.tile.ExternalStorageTile; +import com.refinedmods.refinedstorage.tile.config.IType; import net.minecraft.entity.player.PlayerEntity; public class ExternalStorageContainer extends BaseContainer { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/FilterContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/FilterContainer.java similarity index 68% rename from src/main/java/com/raoulvdberge/refinedstorage/container/FilterContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/FilterContainer.java index 923f303e7..0cb5296d3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/FilterContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/FilterContainer.java @@ -1,15 +1,15 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; -import com.raoulvdberge.refinedstorage.inventory.fluid.FilterFluidInventory; -import com.raoulvdberge.refinedstorage.inventory.fluid.FilterIconFluidInventory; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.FilterIconItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.FilterItemsItemHandler; -import com.raoulvdberge.refinedstorage.item.FilterItem; -import com.raoulvdberge.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; +import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.refinedmods.refinedstorage.inventory.fluid.FilterFluidInventory; +import com.refinedmods.refinedstorage.inventory.fluid.FilterIconFluidInventory; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.inventory.item.FilterIconItemHandler; +import com.refinedmods.refinedstorage.inventory.item.FilterItemsItemHandler; +import com.refinedmods.refinedstorage.item.FilterItem; +import com.refinedmods.refinedstorage.tile.config.IType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/FluidAmountContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/FluidAmountContainer.java similarity index 68% rename from src/main/java/com/raoulvdberge/refinedstorage/container/FluidAmountContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/FluidAmountContainer.java index 430a732f1..61f1e6a51 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/FluidAmountContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/FluidAmountContainer.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.container.slot.filter.DisabledFluidFilterSlot; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.container.slot.filter.DisabledFluidFilterSlot; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/FluidInterfaceContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/FluidInterfaceContainer.java similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/container/FluidInterfaceContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/FluidInterfaceContainer.java index 6a79065a7..34cb8c2c2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/FluidInterfaceContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/FluidInterfaceContainer.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; -import com.raoulvdberge.refinedstorage.tile.FluidInterfaceTile; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; +import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.refinedmods.refinedstorage.tile.FluidInterfaceTile; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/FluidStorageContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/FluidStorageContainer.java similarity index 70% rename from src/main/java/com/raoulvdberge/refinedstorage/container/FluidStorageContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/FluidStorageContainer.java index e691f66c7..72592e235 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/FluidStorageContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/FluidStorageContainer.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; -import com.raoulvdberge.refinedstorage.tile.FluidStorageTile; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.refinedmods.refinedstorage.tile.FluidStorageTile; import net.minecraft.entity.player.PlayerEntity; public class FluidStorageContainer extends BaseContainer { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/GridContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/GridContainer.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/container/GridContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/GridContainer.java index a36cefa95..ea4275479 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/GridContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/GridContainer.java @@ -1,25 +1,25 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.api.network.grid.GridType; -import com.raoulvdberge.refinedstorage.api.network.grid.ICraftingGridListener; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IFluidGridHandler; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.GridNetworkNode; -import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.grid.CraftingGridSlot; -import com.raoulvdberge.refinedstorage.container.slot.grid.ResultCraftingGridSlot; -import com.raoulvdberge.refinedstorage.container.slot.legacy.LegacyBaseSlot; -import com.raoulvdberge.refinedstorage.container.slot.legacy.LegacyDisabledSlot; -import com.raoulvdberge.refinedstorage.container.slot.legacy.LegacyFilterSlot; -import com.raoulvdberge.refinedstorage.screen.IScreenInfoProvider; -import com.raoulvdberge.refinedstorage.tile.BaseTile; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.api.network.grid.GridType; +import com.refinedmods.refinedstorage.api.network.grid.ICraftingGridListener; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.api.network.grid.handler.IFluidGridHandler; +import com.refinedmods.refinedstorage.api.network.grid.handler.IItemGridHandler; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCache; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCacheListener; +import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; +import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; +import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.refinedmods.refinedstorage.container.slot.grid.CraftingGridSlot; +import com.refinedmods.refinedstorage.container.slot.grid.ResultCraftingGridSlot; +import com.refinedmods.refinedstorage.container.slot.legacy.LegacyBaseSlot; +import com.refinedmods.refinedstorage.container.slot.legacy.LegacyDisabledSlot; +import com.refinedmods.refinedstorage.container.slot.legacy.LegacyFilterSlot; +import com.refinedmods.refinedstorage.screen.IScreenInfoProvider; +import com.refinedmods.refinedstorage.tile.BaseTile; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.IContainerListener; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ImporterContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/ImporterContainer.java similarity index 76% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ImporterContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/ImporterContainer.java index e2e9f9300..cc6c123b5 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ImporterContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/ImporterContainer.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; -import com.raoulvdberge.refinedstorage.tile.ImporterTile; -import com.raoulvdberge.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; +import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.refinedmods.refinedstorage.tile.ImporterTile; +import com.refinedmods.refinedstorage.tile.config.IType; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/InterfaceContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/InterfaceContainer.java similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/container/InterfaceContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/InterfaceContainer.java index 94e74135c..f205d3a93 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/InterfaceContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/InterfaceContainer.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.OutputSlot; -import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; -import com.raoulvdberge.refinedstorage.tile.InterfaceTile; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.container.slot.OutputSlot; +import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; +import com.refinedmods.refinedstorage.tile.InterfaceTile; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/NetworkTransmitterContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/NetworkTransmitterContainer.java similarity index 78% rename from src/main/java/com/raoulvdberge/refinedstorage/container/NetworkTransmitterContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/NetworkTransmitterContainer.java index 6fe44ce89..b0fe526f2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/NetworkTransmitterContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/NetworkTransmitterContainer.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.tile.NetworkTransmitterTile; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.tile.NetworkTransmitterTile; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/RelayContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/RelayContainer.java similarity index 64% rename from src/main/java/com/raoulvdberge/refinedstorage/container/RelayContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/RelayContainer.java index 32cc2dd77..a7439ffab 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/RelayContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/RelayContainer.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.tile.RelayTile; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.tile.RelayTile; import net.minecraft.entity.player.PlayerEntity; public class RelayContainer extends BaseContainer { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/SecurityManagerContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/SecurityManagerContainer.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/container/SecurityManagerContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/SecurityManagerContainer.java index f9699228f..4cce82740 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/SecurityManagerContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/SecurityManagerContainer.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.tile.SecurityManagerTile; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.tile.SecurityManagerTile; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/StorageContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/StorageContainer.java similarity index 69% rename from src/main/java/com/raoulvdberge/refinedstorage/container/StorageContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/StorageContainer.java index ba0783ca3..9d94d55b7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/StorageContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/StorageContainer.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; -import com.raoulvdberge.refinedstorage.tile.StorageTile; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; +import com.refinedmods.refinedstorage.tile.StorageTile; import net.minecraft.entity.player.PlayerEntity; public class StorageContainer extends BaseContainer { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/StorageMonitorContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/StorageMonitorContainer.java similarity index 69% rename from src/main/java/com/raoulvdberge/refinedstorage/container/StorageMonitorContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/StorageMonitorContainer.java index 50b39750b..7f7132cf7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/StorageMonitorContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/StorageMonitorContainer.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; -import com.raoulvdberge.refinedstorage.tile.StorageMonitorTile; -import com.raoulvdberge.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; +import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.refinedmods.refinedstorage.tile.StorageMonitorTile; +import com.refinedmods.refinedstorage.tile.config.IType; import net.minecraft.entity.player.PlayerEntity; public class StorageMonitorContainer extends BaseContainer { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/WirelessTransmitterContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/WirelessTransmitterContainer.java similarity index 79% rename from src/main/java/com/raoulvdberge/refinedstorage/container/WirelessTransmitterContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/WirelessTransmitterContainer.java index 50ae7acdc..29d0466a9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/WirelessTransmitterContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/WirelessTransmitterContainer.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.container; +package com.refinedmods.refinedstorage.container; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.tile.WirelessTransmitterTile; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.tile.WirelessTransmitterTile; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/factory/CrafterManagerContainerFactory.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerFactory.java similarity index 79% rename from src/main/java/com/raoulvdberge/refinedstorage/container/factory/CrafterManagerContainerFactory.java rename to src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerFactory.java index 37164bad1..17a53aa41 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/factory/CrafterManagerContainerFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerFactory.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.container.factory; +package com.refinedmods.refinedstorage.container.factory; -import com.raoulvdberge.refinedstorage.container.CrafterManagerContainer; -import com.raoulvdberge.refinedstorage.screen.EmptyScreenInfoProvider; -import com.raoulvdberge.refinedstorage.tile.CrafterManagerTile; +import com.refinedmods.refinedstorage.container.CrafterManagerContainer; +import com.refinedmods.refinedstorage.screen.EmptyScreenInfoProvider; +import com.refinedmods.refinedstorage.tile.CrafterManagerTile; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.network.PacketBuffer; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/factory/CrafterManagerContainerProvider.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerProvider.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/container/factory/CrafterManagerContainerProvider.java rename to src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerProvider.java index 1bcf1daaf..9ce97cae7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/factory/CrafterManagerContainerProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerProvider.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.container.factory; +package com.refinedmods.refinedstorage.container.factory; -import com.raoulvdberge.refinedstorage.container.CrafterManagerContainer; -import com.raoulvdberge.refinedstorage.screen.EmptyScreenInfoProvider; -import com.raoulvdberge.refinedstorage.tile.CrafterManagerTile; +import com.refinedmods.refinedstorage.container.CrafterManagerContainer; +import com.refinedmods.refinedstorage.screen.EmptyScreenInfoProvider; +import com.refinedmods.refinedstorage.tile.CrafterManagerTile; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Container; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/factory/CraftingMonitorContainerFactory.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/CraftingMonitorContainerFactory.java similarity index 71% rename from src/main/java/com/raoulvdberge/refinedstorage/container/factory/CraftingMonitorContainerFactory.java rename to src/main/java/com/refinedmods/refinedstorage/container/factory/CraftingMonitorContainerFactory.java index 4c6ff0445..57b05cafa 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/factory/CraftingMonitorContainerFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/CraftingMonitorContainerFactory.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.container.factory; +package com.refinedmods.refinedstorage.container.factory; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.CraftingMonitorContainer; -import com.raoulvdberge.refinedstorage.tile.craftingmonitor.CraftingMonitorTile; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.container.CraftingMonitorContainer; +import com.refinedmods.refinedstorage.tile.craftingmonitor.CraftingMonitorTile; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.network.PacketBuffer; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/factory/CraftingMonitorContainerProvider.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/CraftingMonitorContainerProvider.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/container/factory/CraftingMonitorContainerProvider.java rename to src/main/java/com/refinedmods/refinedstorage/container/factory/CraftingMonitorContainerProvider.java index 6b28a2f1f..60cd5da00 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/factory/CraftingMonitorContainerProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/CraftingMonitorContainerProvider.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.container.factory; +package com.refinedmods.refinedstorage.container.factory; -import com.raoulvdberge.refinedstorage.container.CraftingMonitorContainer; -import com.raoulvdberge.refinedstorage.tile.craftingmonitor.CraftingMonitorTile; -import com.raoulvdberge.refinedstorage.tile.craftingmonitor.ICraftingMonitor; +import com.refinedmods.refinedstorage.container.CraftingMonitorContainer; +import com.refinedmods.refinedstorage.tile.craftingmonitor.CraftingMonitorTile; +import com.refinedmods.refinedstorage.tile.craftingmonitor.ICraftingMonitor; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Container; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/factory/GridContainerFactory.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/GridContainerFactory.java similarity index 79% rename from src/main/java/com/raoulvdberge/refinedstorage/container/factory/GridContainerFactory.java rename to src/main/java/com/refinedmods/refinedstorage/container/factory/GridContainerFactory.java index 18ae6e90b..02fe86ed4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/factory/GridContainerFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/GridContainerFactory.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.container.factory; +package com.refinedmods.refinedstorage.container.factory; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.container.GridContainer; -import com.raoulvdberge.refinedstorage.tile.BaseTile; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.tile.BaseTile; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/factory/GridContainerProvider.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/GridContainerProvider.java similarity index 77% rename from src/main/java/com/raoulvdberge/refinedstorage/container/factory/GridContainerProvider.java rename to src/main/java/com/refinedmods/refinedstorage/container/factory/GridContainerProvider.java index 3fee13f07..90cb25c37 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/factory/GridContainerProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/GridContainerProvider.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.container.factory; +package com.refinedmods.refinedstorage.container.factory; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.container.GridContainer; -import com.raoulvdberge.refinedstorage.screen.EmptyScreenInfoProvider; -import com.raoulvdberge.refinedstorage.tile.BaseTile; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.screen.EmptyScreenInfoProvider; +import com.refinedmods.refinedstorage.tile.BaseTile; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Container; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/factory/PositionalTileContainerFactory.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/PositionalTileContainerFactory.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/container/factory/PositionalTileContainerFactory.java rename to src/main/java/com/refinedmods/refinedstorage/container/factory/PositionalTileContainerFactory.java index 8d18c9ec4..ad4318c4d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/factory/PositionalTileContainerFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/PositionalTileContainerFactory.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.container.factory; +package com.refinedmods.refinedstorage.container.factory; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Container; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/factory/PositionalTileContainerProvider.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/PositionalTileContainerProvider.java similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/container/factory/PositionalTileContainerProvider.java rename to src/main/java/com/refinedmods/refinedstorage/container/factory/PositionalTileContainerProvider.java index 6a09c93ea..c84f9d3d1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/factory/PositionalTileContainerProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/PositionalTileContainerProvider.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.container.factory; +package com.refinedmods.refinedstorage.container.factory; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/factory/WirelessCraftingMonitorContainerFactory.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/WirelessCraftingMonitorContainerFactory.java similarity index 73% rename from src/main/java/com/raoulvdberge/refinedstorage/container/factory/WirelessCraftingMonitorContainerFactory.java rename to src/main/java/com/refinedmods/refinedstorage/container/factory/WirelessCraftingMonitorContainerFactory.java index 1e1b4410c..f99a3a316 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/factory/WirelessCraftingMonitorContainerFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/WirelessCraftingMonitorContainerFactory.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.container.factory; +package com.refinedmods.refinedstorage.container.factory; -import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.CraftingMonitorContainer; -import com.raoulvdberge.refinedstorage.tile.craftingmonitor.WirelessCraftingMonitor; +import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.container.CraftingMonitorContainer; +import com.refinedmods.refinedstorage.tile.craftingmonitor.WirelessCraftingMonitor; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/BaseSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/BaseSlot.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/BaseSlot.java rename to src/main/java/com/refinedmods/refinedstorage/container/slot/BaseSlot.java index f943f04a8..c46b1baf7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/BaseSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/BaseSlot.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.container.slot; +package com.refinedmods.refinedstorage.container.slot; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.SlotItemHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/CrafterManagerSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/CrafterManagerSlot.java similarity index 78% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/CrafterManagerSlot.java rename to src/main/java/com/refinedmods/refinedstorage/container/slot/CrafterManagerSlot.java index 7eb755f73..737baffab 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/CrafterManagerSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/CrafterManagerSlot.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.container.slot; +package com.refinedmods.refinedstorage.container.slot; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.CrafterManagerNetworkNode; -import com.raoulvdberge.refinedstorage.screen.IScreenInfoProvider; +import com.refinedmods.refinedstorage.apiimpl.network.node.CrafterManagerNetworkNode; +import com.refinedmods.refinedstorage.screen.IScreenInfoProvider; import net.minecraftforge.items.IItemHandler; public class CrafterManagerSlot extends BaseSlot { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/DisabledSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/DisabledSlot.java similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/DisabledSlot.java rename to src/main/java/com/refinedmods/refinedstorage/container/slot/DisabledSlot.java index c4e6d6289..e682172df 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/DisabledSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/DisabledSlot.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.container.slot; +package com.refinedmods.refinedstorage.container.slot; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/OutputSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/OutputSlot.java similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/OutputSlot.java rename to src/main/java/com/refinedmods/refinedstorage/container/slot/OutputSlot.java index 0024b1184..0f3fa6878 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/OutputSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/OutputSlot.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.container.slot; +package com.refinedmods.refinedstorage.container.slot; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/DisabledFluidFilterSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/DisabledFluidFilterSlot.java similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/DisabledFluidFilterSlot.java rename to src/main/java/com/refinedmods/refinedstorage/container/slot/filter/DisabledFluidFilterSlot.java index 53143fea9..7f812a280 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/DisabledFluidFilterSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/DisabledFluidFilterSlot.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.container.slot.filter; +package com.refinedmods.refinedstorage.container.slot.filter; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; import net.minecraft.item.ItemStack; import javax.annotation.Nonnull; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/FilterSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FilterSlot.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/FilterSlot.java rename to src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FilterSlot.java index 3db3843c1..44d208207 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/FilterSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FilterSlot.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.container.slot.filter; +package com.refinedmods.refinedstorage.container.slot.filter; -import com.raoulvdberge.refinedstorage.container.slot.BaseSlot; +import com.refinedmods.refinedstorage.container.slot.BaseSlot; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/FluidFilterSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FluidFilterSlot.java similarity index 84% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/FluidFilterSlot.java rename to src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FluidFilterSlot.java index 3694e3f5f..7f88ac9ff 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/FluidFilterSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FluidFilterSlot.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.container.slot.filter; +package com.refinedmods.refinedstorage.container.slot.filter; -import com.raoulvdberge.refinedstorage.container.slot.BaseSlot; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.container.slot.BaseSlot; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraftforge.items.ItemStackHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/CraftingGridSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/grid/CraftingGridSlot.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/CraftingGridSlot.java rename to src/main/java/com/refinedmods/refinedstorage/container/slot/grid/CraftingGridSlot.java index 9079d835a..95084b163 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/CraftingGridSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/grid/CraftingGridSlot.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.container.slot.grid; +package com.refinedmods.refinedstorage.container.slot.grid; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.Slot; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/ResultCraftingGridSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/grid/ResultCraftingGridSlot.java similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/ResultCraftingGridSlot.java rename to src/main/java/com/refinedmods/refinedstorage/container/slot/grid/ResultCraftingGridSlot.java index 1932e898f..e791d8f04 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/ResultCraftingGridSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/grid/ResultCraftingGridSlot.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.container.slot.grid; +package com.refinedmods.refinedstorage.container.slot.grid; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.CraftingResultSlot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/LegacyBaseSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyBaseSlot.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/LegacyBaseSlot.java rename to src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyBaseSlot.java index 0b6457fe6..aa7008220 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/LegacyBaseSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyBaseSlot.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.container.slot.legacy; +package com.refinedmods.refinedstorage.container.slot.legacy; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.Slot; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/LegacyDisabledSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyDisabledSlot.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/LegacyDisabledSlot.java rename to src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyDisabledSlot.java index a1f58f15b..be3a8a3c0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/LegacyDisabledSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyDisabledSlot.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.container.slot.legacy; +package com.refinedmods.refinedstorage.container.slot.legacy; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/LegacyFilterSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyFilterSlot.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/LegacyFilterSlot.java rename to src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyFilterSlot.java index 588d54806..a25db5f3e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/LegacyFilterSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyFilterSlot.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.container.slot.legacy; +package com.refinedmods.refinedstorage.container.slot.legacy; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/FilterInventoryWrapper.java b/src/main/java/com/refinedmods/refinedstorage/container/transfer/FilterInventoryWrapper.java similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/container/transfer/FilterInventoryWrapper.java rename to src/main/java/com/refinedmods/refinedstorage/container/transfer/FilterInventoryWrapper.java index 790b8dc3c..81681eaf7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/FilterInventoryWrapper.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/transfer/FilterInventoryWrapper.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.container.transfer; +package com.refinedmods.refinedstorage.container.transfer; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.tile.config.IType; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandlerModifiable; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/FluidFilterInventoryWrapper.java b/src/main/java/com/refinedmods/refinedstorage/container/transfer/FluidFilterInventoryWrapper.java similarity index 79% rename from src/main/java/com/raoulvdberge/refinedstorage/container/transfer/FluidFilterInventoryWrapper.java rename to src/main/java/com/refinedmods/refinedstorage/container/transfer/FluidFilterInventoryWrapper.java index d7d057c9e..b51b6eb51 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/FluidFilterInventoryWrapper.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/transfer/FluidFilterInventoryWrapper.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.container.transfer; +package com.refinedmods.refinedstorage.container.transfer; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/IInventoryWrapper.java b/src/main/java/com/refinedmods/refinedstorage/container/transfer/IInventoryWrapper.java similarity index 65% rename from src/main/java/com/raoulvdberge/refinedstorage/container/transfer/IInventoryWrapper.java rename to src/main/java/com/refinedmods/refinedstorage/container/transfer/IInventoryWrapper.java index 7c8f1e23d..03d68604f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/IInventoryWrapper.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/transfer/IInventoryWrapper.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.container.transfer; +package com.refinedmods.refinedstorage.container.transfer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InsertionResult.java b/src/main/java/com/refinedmods/refinedstorage/container/transfer/InsertionResult.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InsertionResult.java rename to src/main/java/com/refinedmods/refinedstorage/container/transfer/InsertionResult.java index a793f5047..5d03590d4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InsertionResult.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/transfer/InsertionResult.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.container.transfer; +package com.refinedmods.refinedstorage.container.transfer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InsertionResultType.java b/src/main/java/com/refinedmods/refinedstorage/container/transfer/InsertionResultType.java similarity index 52% rename from src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InsertionResultType.java rename to src/main/java/com/refinedmods/refinedstorage/container/transfer/InsertionResultType.java index ecf37dd8c..1435ac83b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InsertionResultType.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/transfer/InsertionResultType.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.container.transfer; +package com.refinedmods.refinedstorage.container.transfer; enum InsertionResultType { CONTINUE_IF_POSSIBLE, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryInventoryWrapper.java b/src/main/java/com/refinedmods/refinedstorage/container/transfer/InventoryInventoryWrapper.java similarity index 96% rename from src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryInventoryWrapper.java rename to src/main/java/com/refinedmods/refinedstorage/container/transfer/InventoryInventoryWrapper.java index f9796d551..c0e092c34 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryInventoryWrapper.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/transfer/InventoryInventoryWrapper.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.container.transfer; +package com.refinedmods.refinedstorage.container.transfer; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/ItemFilterInventoryWrapper.java b/src/main/java/com/refinedmods/refinedstorage/container/transfer/ItemFilterInventoryWrapper.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/container/transfer/ItemFilterInventoryWrapper.java rename to src/main/java/com/refinedmods/refinedstorage/container/transfer/ItemFilterInventoryWrapper.java index 94721f6f7..90d0a81dc 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/ItemFilterInventoryWrapper.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/transfer/ItemFilterInventoryWrapper.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.container.transfer; +package com.refinedmods.refinedstorage.container.transfer; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemHandlerHelper; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/ItemHandlerInventoryWrapper.java b/src/main/java/com/refinedmods/refinedstorage/container/transfer/ItemHandlerInventoryWrapper.java similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/container/transfer/ItemHandlerInventoryWrapper.java rename to src/main/java/com/refinedmods/refinedstorage/container/transfer/ItemHandlerInventoryWrapper.java index 38ff4cf0a..9f266a213 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/ItemHandlerInventoryWrapper.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/transfer/ItemHandlerInventoryWrapper.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.container.transfer; +package com.refinedmods.refinedstorage.container.transfer; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/TransferManager.java b/src/main/java/com/refinedmods/refinedstorage/container/transfer/TransferManager.java similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/container/transfer/TransferManager.java rename to src/main/java/com/refinedmods/refinedstorage/container/transfer/TransferManager.java index 669c5a857..fe565990b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/TransferManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/transfer/TransferManager.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.container.transfer; +package com.refinedmods.refinedstorage.container.transfer; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.Slot; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/energy/BaseEnergyStorage.java b/src/main/java/com/refinedmods/refinedstorage/energy/BaseEnergyStorage.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/energy/BaseEnergyStorage.java rename to src/main/java/com/refinedmods/refinedstorage/energy/BaseEnergyStorage.java index 238522721..140ea267f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/energy/BaseEnergyStorage.java +++ b/src/main/java/com/refinedmods/refinedstorage/energy/BaseEnergyStorage.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.energy; +package com.refinedmods.refinedstorage.energy; import net.minecraftforge.energy.EnergyStorage; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/energy/ItemEnergyStorage.java b/src/main/java/com/refinedmods/refinedstorage/energy/ItemEnergyStorage.java similarity index 96% rename from src/main/java/com/raoulvdberge/refinedstorage/energy/ItemEnergyStorage.java rename to src/main/java/com/refinedmods/refinedstorage/energy/ItemEnergyStorage.java index 48cb48519..c0f44aeab 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/energy/ItemEnergyStorage.java +++ b/src/main/java/com/refinedmods/refinedstorage/energy/ItemEnergyStorage.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.energy; +package com.refinedmods.refinedstorage.energy; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java b/src/main/java/com/refinedmods/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java rename to src/main/java/com/refinedmods/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java index c762a5165..b86e51689 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.integration.craftingtweaks; +package com.refinedmods.refinedstorage.integration.craftingtweaks; -import com.raoulvdberge.refinedstorage.api.network.grid.GridType; -import com.raoulvdberge.refinedstorage.container.GridContainer; -import com.raoulvdberge.refinedstorage.container.slot.grid.CraftingGridSlot; +import com.refinedmods.refinedstorage.api.network.grid.GridType; +import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.slot.grid.CraftingGridSlot; import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.fml.InterModComms; import net.minecraftforge.fml.ModList; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/inventorysorter/InventorySorterIntegration.java b/src/main/java/com/refinedmods/refinedstorage/integration/inventorysorter/InventorySorterIntegration.java similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/integration/inventorysorter/InventorySorterIntegration.java rename to src/main/java/com/refinedmods/refinedstorage/integration/inventorysorter/InventorySorterIntegration.java index ff9b06209..ec8d1f067 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/inventorysorter/InventorySorterIntegration.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/inventorysorter/InventorySorterIntegration.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.integration.inventorysorter; +package com.refinedmods.refinedstorage.integration.inventorysorter; import net.minecraftforge.fml.ModList; @@ -11,6 +11,6 @@ public class InventorySorterIntegration { public static void register() { // Prevent items moving while scrolling through slots with Inventory Sorter in the Crafter Manager - // InterModComms.sendTo("inventorysorter", "slotblacklist", () -> "com.raoulvdberge.refinedstorage.container.slot.CrafterManagerSlot"); + // InterModComms.sendTo("inventorysorter", "slotblacklist", () -> "com.refinedmods.refinedstorage.container.slot.CrafterManagerSlot"); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/inventorytweaks/InventoryTweaksIntegration.java b/src/main/java/com/refinedmods/refinedstorage/integration/inventorytweaks/InventoryTweaksIntegration.java similarity index 73% rename from src/main/java/com/raoulvdberge/refinedstorage/integration/inventorytweaks/InventoryTweaksIntegration.java rename to src/main/java/com/refinedmods/refinedstorage/integration/inventorytweaks/InventoryTweaksIntegration.java index 268ab419a..7b8552399 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/inventorytweaks/InventoryTweaksIntegration.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/inventorytweaks/InventoryTweaksIntegration.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.integration.inventorytweaks; +package com.refinedmods.refinedstorage.integration.inventorytweaks; import net.minecraftforge.fml.ModList; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GhostIngredientHandler.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GhostIngredientHandler.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GhostIngredientHandler.java rename to src/main/java/com/refinedmods/refinedstorage/integration/jei/GhostIngredientHandler.java index 8c683b609..8534d780c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GhostIngredientHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GhostIngredientHandler.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.integration.jei; +package com.refinedmods.refinedstorage.integration.jei; -import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.legacy.LegacyFilterSlot; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; +import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.refinedmods.refinedstorage.container.slot.legacy.LegacyFilterSlot; +import com.refinedmods.refinedstorage.screen.BaseScreen; import mezz.jei.api.gui.handlers.IGhostIngredientHandler; import net.minecraft.client.renderer.Rectangle2d; import net.minecraft.inventory.container.Slot; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GridRecipeTransferHandler.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GridRecipeTransferHandler.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GridRecipeTransferHandler.java rename to src/main/java/com/refinedmods/refinedstorage/integration/jei/GridRecipeTransferHandler.java index f5b74b73a..14ad7f8e6 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GridRecipeTransferHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GridRecipeTransferHandler.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.integration.jei; +package com.refinedmods.refinedstorage.integration.jei; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.grid.GridType; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.container.GridContainer; -import com.raoulvdberge.refinedstorage.network.grid.GridProcessingTransferMessage; -import com.raoulvdberge.refinedstorage.network.grid.GridTransferMessage; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.grid.GridType; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.network.grid.GridProcessingTransferMessage; +import com.refinedmods.refinedstorage.network.grid.GridTransferMessage; import mezz.jei.api.constants.VanillaRecipeCategoryUid; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.ingredient.IGuiIngredient; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GuiContainerHandler.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GuiContainerHandler.java similarity index 77% rename from src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GuiContainerHandler.java rename to src/main/java/com/refinedmods/refinedstorage/integration/jei/GuiContainerHandler.java index 717056513..136fd2318 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GuiContainerHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GuiContainerHandler.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.integration.jei; +package com.refinedmods.refinedstorage.integration.jei; -import com.raoulvdberge.refinedstorage.container.BaseContainer; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; -import com.raoulvdberge.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.container.BaseContainer; +import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.grid.GridScreen; +import com.refinedmods.refinedstorage.util.RenderUtils; import mezz.jei.api.gui.handlers.IGuiContainerHandler; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/JeiIntegration.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/JeiIntegration.java similarity index 75% rename from src/main/java/com/raoulvdberge/refinedstorage/integration/jei/JeiIntegration.java rename to src/main/java/com/refinedmods/refinedstorage/integration/jei/JeiIntegration.java index 22193557c..63171776a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/JeiIntegration.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/JeiIntegration.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.integration.jei; +package com.refinedmods.refinedstorage.integration.jei; import net.minecraftforge.fml.ModList; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJeiPlugin.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/RSJeiPlugin.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJeiPlugin.java rename to src/main/java/com/refinedmods/refinedstorage/integration/jei/RSJeiPlugin.java index fcd06600e..35d2b0072 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJeiPlugin.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/RSJeiPlugin.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.integration.jei; +package com.refinedmods.refinedstorage.integration.jei; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.screen.BaseScreen; import mezz.jei.api.IModPlugin; import mezz.jei.api.JeiPlugin; import mezz.jei.api.registration.IGuiHandlerRegistration; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FilterFluidInventory.java b/src/main/java/com/refinedmods/refinedstorage/inventory/fluid/FilterFluidInventory.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FilterFluidInventory.java rename to src/main/java/com/refinedmods/refinedstorage/inventory/fluid/FilterFluidInventory.java index 54a69267f..cd29b0d04 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FilterFluidInventory.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/fluid/FilterFluidInventory.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.inventory.fluid; +package com.refinedmods.refinedstorage.inventory.fluid; -import com.raoulvdberge.refinedstorage.item.FilterItem; +import com.refinedmods.refinedstorage.item.FilterItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.NonNullList; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FilterIconFluidInventory.java b/src/main/java/com/refinedmods/refinedstorage/inventory/fluid/FilterIconFluidInventory.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FilterIconFluidInventory.java rename to src/main/java/com/refinedmods/refinedstorage/inventory/fluid/FilterIconFluidInventory.java index 50ba3599b..f68f88dd1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FilterIconFluidInventory.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/fluid/FilterIconFluidInventory.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.inventory.fluid; +package com.refinedmods.refinedstorage.inventory.fluid; -import com.raoulvdberge.refinedstorage.item.FilterItem; +import com.refinedmods.refinedstorage.item.FilterItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidInventory.java b/src/main/java/com/refinedmods/refinedstorage/inventory/fluid/FluidInventory.java similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidInventory.java rename to src/main/java/com/refinedmods/refinedstorage/inventory/fluid/FluidInventory.java index 4337547f2..169a1c557 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidInventory.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/fluid/FluidInventory.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.inventory.fluid; +package com.refinedmods.refinedstorage.inventory.fluid; -import com.raoulvdberge.refinedstorage.inventory.listener.InventoryListener; +import com.refinedmods.refinedstorage.inventory.listener.InventoryListener; import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/ProxyFluidHandler.java b/src/main/java/com/refinedmods/refinedstorage/inventory/fluid/ProxyFluidHandler.java similarity index 96% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/ProxyFluidHandler.java rename to src/main/java/com/refinedmods/refinedstorage/inventory/fluid/ProxyFluidHandler.java index 1ab255082..89c48a586 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/ProxyFluidHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/fluid/ProxyFluidHandler.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.inventory.fluid; +package com.refinedmods.refinedstorage.inventory.fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/BaseItemHandler.java b/src/main/java/com/refinedmods/refinedstorage/inventory/item/BaseItemHandler.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/item/BaseItemHandler.java rename to src/main/java/com/refinedmods/refinedstorage/inventory/item/BaseItemHandler.java index 023c72856..8439d51d5 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/BaseItemHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/item/BaseItemHandler.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.inventory.item; +package com.refinedmods.refinedstorage.inventory.item; -import com.raoulvdberge.refinedstorage.inventory.listener.InventoryListener; +import com.refinedmods.refinedstorage.inventory.listener.InventoryListener; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.items.ItemStackHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/FilterIconItemHandler.java b/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterIconItemHandler.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/item/FilterIconItemHandler.java rename to src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterIconItemHandler.java index 1f49ee4d6..71ed88a51 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/FilterIconItemHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterIconItemHandler.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.inventory.item; +package com.refinedmods.refinedstorage.inventory.item; -import com.raoulvdberge.refinedstorage.item.FilterItem; +import com.refinedmods.refinedstorage.item.FilterItem; import net.minecraft.item.ItemStack; import net.minecraftforge.items.ItemStackHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/FilterItemHandler.java b/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterItemHandler.java similarity index 75% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/item/FilterItemHandler.java rename to src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterItemHandler.java index 3cc78862a..8ff3337d7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/FilterItemHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterItemHandler.java @@ -1,16 +1,16 @@ -package com.raoulvdberge.refinedstorage.inventory.item; +package com.refinedmods.refinedstorage.inventory.item; -import com.raoulvdberge.refinedstorage.RSItems; -import com.raoulvdberge.refinedstorage.api.network.grid.IGridTab; -import com.raoulvdberge.refinedstorage.api.util.IFilter; -import com.raoulvdberge.refinedstorage.apiimpl.network.grid.GridTab; -import com.raoulvdberge.refinedstorage.apiimpl.util.FluidFilter; -import com.raoulvdberge.refinedstorage.apiimpl.util.ItemFilter; -import com.raoulvdberge.refinedstorage.inventory.fluid.FilterFluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidator; -import com.raoulvdberge.refinedstorage.item.FilterItem; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; +import com.refinedmods.refinedstorage.RSItems; +import com.refinedmods.refinedstorage.api.network.grid.IGridTab; +import com.refinedmods.refinedstorage.api.util.IFilter; +import com.refinedmods.refinedstorage.apiimpl.network.grid.GridTab; +import com.refinedmods.refinedstorage.apiimpl.util.FluidFilter; +import com.refinedmods.refinedstorage.apiimpl.util.ItemFilter; +import com.refinedmods.refinedstorage.inventory.fluid.FilterFluidInventory; +import com.refinedmods.refinedstorage.inventory.item.validator.ItemValidator; +import com.refinedmods.refinedstorage.item.FilterItem; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.grid.GridScreen; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.LogicalSide; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/FilterItemsItemHandler.java b/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterItemsItemHandler.java similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/item/FilterItemsItemHandler.java rename to src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterItemsItemHandler.java index edf5e786d..651349e90 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/FilterItemsItemHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterItemsItemHandler.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.inventory.item; +package com.refinedmods.refinedstorage.inventory.item; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.NonNullList; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ProxyItemHandler.java b/src/main/java/com/refinedmods/refinedstorage/inventory/item/ProxyItemHandler.java similarity index 96% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ProxyItemHandler.java rename to src/main/java/com/refinedmods/refinedstorage/inventory/item/ProxyItemHandler.java index 3496a0e70..80889dc24 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ProxyItemHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/item/ProxyItemHandler.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.inventory.item; +package com.refinedmods.refinedstorage.inventory.item; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/UpgradeItemHandler.java b/src/main/java/com/refinedmods/refinedstorage/inventory/item/UpgradeItemHandler.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/item/UpgradeItemHandler.java rename to src/main/java/com/refinedmods/refinedstorage/inventory/item/UpgradeItemHandler.java index c1cdcc7a9..5647263f8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/UpgradeItemHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/item/UpgradeItemHandler.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.inventory.item; +package com.refinedmods.refinedstorage.inventory.item; -import com.raoulvdberge.refinedstorage.inventory.item.validator.UpgradeItemValidator; -import com.raoulvdberge.refinedstorage.item.UpgradeItem; +import com.refinedmods.refinedstorage.inventory.item.validator.UpgradeItemValidator; +import com.refinedmods.refinedstorage.item.UpgradeItem; import net.minecraft.item.ItemStack; public class UpgradeItemHandler extends BaseItemHandler { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/validator/ItemValidator.java b/src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/ItemValidator.java similarity index 84% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/item/validator/ItemValidator.java rename to src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/ItemValidator.java index e126c9bdf..64aadeb7f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/validator/ItemValidator.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/ItemValidator.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.inventory.item.validator; +package com.refinedmods.refinedstorage.inventory.item.validator; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/validator/PatternItemValidator.java b/src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/PatternItemValidator.java similarity index 77% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/item/validator/PatternItemValidator.java rename to src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/PatternItemValidator.java index ea70a7afd..276e87fe4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/validator/PatternItemValidator.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/PatternItemValidator.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.inventory.item.validator; +package com.refinedmods.refinedstorage.inventory.item.validator; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternProvider; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternProvider; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/validator/StorageDiskItemValidator.java b/src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/StorageDiskItemValidator.java similarity index 70% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/item/validator/StorageDiskItemValidator.java rename to src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/StorageDiskItemValidator.java index 90a3c2891..d37044e3b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/validator/StorageDiskItemValidator.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/StorageDiskItemValidator.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.inventory.item.validator; +package com.refinedmods.refinedstorage.inventory.item.validator; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskProvider; import net.minecraft.item.ItemStack; import java.util.function.Predicate; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/validator/UpgradeItemValidator.java b/src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/UpgradeItemValidator.java similarity index 78% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/item/validator/UpgradeItemValidator.java rename to src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/UpgradeItemValidator.java index f798b626b..5a71f1890 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/validator/UpgradeItemValidator.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/UpgradeItemValidator.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.inventory.item.validator; +package com.refinedmods.refinedstorage.inventory.item.validator; -import com.raoulvdberge.refinedstorage.item.UpgradeItem; +import com.refinedmods.refinedstorage.item.UpgradeItem; import net.minecraft.item.ItemStack; import java.util.function.Predicate; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/InventoryListener.java b/src/main/java/com/refinedmods/refinedstorage/inventory/listener/InventoryListener.java similarity index 62% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/InventoryListener.java rename to src/main/java/com/refinedmods/refinedstorage/inventory/listener/InventoryListener.java index 999fd074e..2bdd419bf 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/InventoryListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/listener/InventoryListener.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.inventory.listener; +package com.refinedmods.refinedstorage.inventory.listener; public interface InventoryListener { void onChanged(T handler, int slot, boolean reading); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/NetworkNodeFluidInventoryListener.java b/src/main/java/com/refinedmods/refinedstorage/inventory/listener/NetworkNodeFluidInventoryListener.java similarity index 66% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/NetworkNodeFluidInventoryListener.java rename to src/main/java/com/refinedmods/refinedstorage/inventory/listener/NetworkNodeFluidInventoryListener.java index 2bd4b5a89..93b699309 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/NetworkNodeFluidInventoryListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/listener/NetworkNodeFluidInventoryListener.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.inventory.listener; +package com.refinedmods.refinedstorage.inventory.listener; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; public class NetworkNodeFluidInventoryListener implements InventoryListener { private INetworkNode node; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/NetworkNodeInventoryListener.java b/src/main/java/com/refinedmods/refinedstorage/inventory/listener/NetworkNodeInventoryListener.java similarity index 65% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/NetworkNodeInventoryListener.java rename to src/main/java/com/refinedmods/refinedstorage/inventory/listener/NetworkNodeInventoryListener.java index bc53c4c1f..405bd1790 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/NetworkNodeInventoryListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/listener/NetworkNodeInventoryListener.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.inventory.listener; +package com.refinedmods.refinedstorage.inventory.listener; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; public class NetworkNodeInventoryListener implements InventoryListener { private INetworkNode node; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/TileInventoryListener.java b/src/main/java/com/refinedmods/refinedstorage/inventory/listener/TileInventoryListener.java similarity index 75% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/TileInventoryListener.java rename to src/main/java/com/refinedmods/refinedstorage/inventory/listener/TileInventoryListener.java index 1f336bd01..e79decca4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/TileInventoryListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/listener/TileInventoryListener.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.inventory.listener; +package com.refinedmods.refinedstorage.inventory.listener; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; import net.minecraft.tileentity.TileEntity; public class TileInventoryListener implements InventoryListener { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/CoreItem.java b/src/main/java/com/refinedmods/refinedstorage/item/CoreItem.java similarity index 79% rename from src/main/java/com/raoulvdberge/refinedstorage/item/CoreItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/CoreItem.java index c75b6d39d..d64335306 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/CoreItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/CoreItem.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.RS; +import com.refinedmods.refinedstorage.RS; import net.minecraft.item.Item; public class CoreItem extends Item { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/EnergyItem.java b/src/main/java/com/refinedmods/refinedstorage/item/EnergyItem.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/item/EnergyItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/EnergyItem.java index e40341b8d..fc430112e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/EnergyItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/EnergyItem.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.item.capabilityprovider.EnergyCapabilityProvider; -import com.raoulvdberge.refinedstorage.render.Styles; +import com.refinedmods.refinedstorage.item.capabilityprovider.EnergyCapabilityProvider; +import com.refinedmods.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/FilterItem.java b/src/main/java/com/refinedmods/refinedstorage/item/FilterItem.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/item/FilterItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/FilterItem.java index 80aa3da29..0f5c93a5a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/FilterItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/FilterItem.java @@ -1,15 +1,15 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSItems; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.api.util.IFilter; -import com.raoulvdberge.refinedstorage.container.FilterContainer; -import com.raoulvdberge.refinedstorage.inventory.fluid.FilterFluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.FilterItemsItemHandler; -import com.raoulvdberge.refinedstorage.render.Styles; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSItems; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.api.util.IFilter; +import com.refinedmods.refinedstorage.container.FilterContainer; +import com.refinedmods.refinedstorage.inventory.fluid.FilterFluidInventory; +import com.refinedmods.refinedstorage.inventory.item.FilterItemsItemHandler; +import com.refinedmods.refinedstorage.render.Styles; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/FluidStorageDiskItem.java b/src/main/java/com/refinedmods/refinedstorage/item/FluidStorageDiskItem.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/item/FluidStorageDiskItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/FluidStorageDiskItem.java index 3b76f06d4..514dab0c8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/FluidStorageDiskItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/FluidStorageDiskItem.java @@ -1,14 +1,14 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSItems; -import com.raoulvdberge.refinedstorage.api.storage.StorageType; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider; -import com.raoulvdberge.refinedstorage.api.storage.disk.StorageDiskSyncData; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.storage.FluidStorageType; -import com.raoulvdberge.refinedstorage.render.Styles; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSItems; +import com.refinedmods.refinedstorage.api.storage.StorageType; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskProvider; +import com.refinedmods.refinedstorage.api.storage.disk.StorageDiskSyncData; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.storage.FluidStorageType; +import com.refinedmods.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/FluidStoragePartItem.java b/src/main/java/com/refinedmods/refinedstorage/item/FluidStoragePartItem.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/item/FluidStoragePartItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/FluidStoragePartItem.java index 403cdfa5a..cf7403c5c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/FluidStoragePartItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/FluidStoragePartItem.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSItems; -import com.raoulvdberge.refinedstorage.apiimpl.storage.FluidStorageType; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSItems; +import com.refinedmods.refinedstorage.apiimpl.storage.FluidStorageType; import net.minecraft.item.Item; public class FluidStoragePartItem extends Item { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/NetworkCardItem.java b/src/main/java/com/refinedmods/refinedstorage/item/NetworkCardItem.java similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/item/NetworkCardItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/NetworkCardItem.java index e7d52c174..aefada412 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/NetworkCardItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/NetworkCardItem.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSBlocks; -import com.raoulvdberge.refinedstorage.render.Styles; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSBlocks; +import com.refinedmods.refinedstorage.render.Styles; import net.minecraft.block.Block; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/NetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/item/NetworkItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java index c373c3fad..16a0e8440 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/NetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemProvider; -import com.raoulvdberge.refinedstorage.render.Styles; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.item.INetworkItemProvider; +import com.refinedmods.refinedstorage.render.Styles; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/PatternItem.java b/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/item/PatternItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java index 64c128aca..c6b234683 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/PatternItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java @@ -1,16 +1,16 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSItems; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternProvider; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.AllowedTagList; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPattern; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPatternFactory; -import com.raoulvdberge.refinedstorage.render.Styles; -import com.raoulvdberge.refinedstorage.render.tesr.PatternItemStackTileRenderer; -import com.raoulvdberge.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSItems; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternContainer; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternProvider; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.AllowedTagList; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.CraftingPattern; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.CraftingPatternFactory; +import com.refinedmods.refinedstorage.render.Styles; +import com.refinedmods.refinedstorage.render.tesr.PatternItemStackTileRenderer; +import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.gui.screen.inventory.ContainerScreen; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ProcessorBindingItem.java b/src/main/java/com/refinedmods/refinedstorage/item/ProcessorBindingItem.java similarity index 73% rename from src/main/java/com/raoulvdberge/refinedstorage/item/ProcessorBindingItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/ProcessorBindingItem.java index b86385bac..0345284b7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ProcessorBindingItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/ProcessorBindingItem.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.RS; +import com.refinedmods.refinedstorage.RS; import net.minecraft.item.Item; public class ProcessorBindingItem extends Item { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ProcessorItem.java b/src/main/java/com/refinedmods/refinedstorage/item/ProcessorItem.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/item/ProcessorItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/ProcessorItem.java index 46b26cbcb..2d59edf52 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ProcessorItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/ProcessorItem.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.RS; +import com.refinedmods.refinedstorage.RS; import net.minecraft.item.Item; public class ProcessorItem extends Item { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/QuartzEnrichedIronItem.java b/src/main/java/com/refinedmods/refinedstorage/item/QuartzEnrichedIronItem.java similarity index 73% rename from src/main/java/com/raoulvdberge/refinedstorage/item/QuartzEnrichedIronItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/QuartzEnrichedIronItem.java index 7a907a462..77744edff 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/QuartzEnrichedIronItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/QuartzEnrichedIronItem.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.RS; +import com.refinedmods.refinedstorage.RS; import net.minecraft.item.Item; public class QuartzEnrichedIronItem extends Item { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/SecurityCardItem.java b/src/main/java/com/refinedmods/refinedstorage/item/SecurityCardItem.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/item/SecurityCardItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/SecurityCardItem.java index 41032fa3a..a979d1813 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/SecurityCardItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/SecurityCardItem.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.render.Styles; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/SiliconItem.java b/src/main/java/com/refinedmods/refinedstorage/item/SiliconItem.java similarity index 70% rename from src/main/java/com/raoulvdberge/refinedstorage/item/SiliconItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/SiliconItem.java index 41d76bb0c..252ee7ff7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/SiliconItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/SiliconItem.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.RS; +import com.refinedmods.refinedstorage.RS; import net.minecraft.item.Item; public class SiliconItem extends Item { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/StorageDiskItem.java b/src/main/java/com/refinedmods/refinedstorage/item/StorageDiskItem.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/item/StorageDiskItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/StorageDiskItem.java index 793c8f210..4fbbf00ab 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/StorageDiskItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/StorageDiskItem.java @@ -1,14 +1,14 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSItems; -import com.raoulvdberge.refinedstorage.api.storage.StorageType; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider; -import com.raoulvdberge.refinedstorage.api.storage.disk.StorageDiskSyncData; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.storage.ItemStorageType; -import com.raoulvdberge.refinedstorage.render.Styles; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSItems; +import com.refinedmods.refinedstorage.api.storage.StorageType; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskProvider; +import com.refinedmods.refinedstorage.api.storage.disk.StorageDiskSyncData; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.storage.ItemStorageType; +import com.refinedmods.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/StorageHousingItem.java b/src/main/java/com/refinedmods/refinedstorage/item/StorageHousingItem.java similarity index 72% rename from src/main/java/com/raoulvdberge/refinedstorage/item/StorageHousingItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/StorageHousingItem.java index ad4fdf8c2..e398d8e46 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/StorageHousingItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/StorageHousingItem.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.RS; +import com.refinedmods.refinedstorage.RS; import net.minecraft.item.Item; public class StorageHousingItem extends Item { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/StoragePartItem.java b/src/main/java/com/refinedmods/refinedstorage/item/StoragePartItem.java similarity index 79% rename from src/main/java/com/raoulvdberge/refinedstorage/item/StoragePartItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/StoragePartItem.java index 634a90928..7398c12cd 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/StoragePartItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/StoragePartItem.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSItems; -import com.raoulvdberge.refinedstorage.apiimpl.storage.ItemStorageType; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSItems; +import com.refinedmods.refinedstorage.apiimpl.storage.ItemStorageType; import net.minecraft.item.Item; public class StoragePartItem extends Item { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/UpgradeItem.java b/src/main/java/com/refinedmods/refinedstorage/item/UpgradeItem.java similarity index 96% rename from src/main/java/com/raoulvdberge/refinedstorage/item/UpgradeItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/UpgradeItem.java index 0873af2c0..e8ff0d936 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/UpgradeItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/UpgradeItem.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.render.Styles; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/WirelessCraftingMonitorItem.java b/src/main/java/com/refinedmods/refinedstorage/item/WirelessCraftingMonitorItem.java similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/item/WirelessCraftingMonitorItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/WirelessCraftingMonitorItem.java index 7c60e188f..62bf2f8ae 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/WirelessCraftingMonitorItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/WirelessCraftingMonitorItem.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.item.INetworkItem; -import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemManager; -import com.raoulvdberge.refinedstorage.apiimpl.network.item.WirelessCraftingMonitorNetworkItem; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.item.INetworkItem; +import com.refinedmods.refinedstorage.api.network.item.INetworkItemManager; +import com.refinedmods.refinedstorage.apiimpl.network.item.WirelessCraftingMonitorNetworkItem; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/WirelessFluidGridItem.java b/src/main/java/com/refinedmods/refinedstorage/item/WirelessFluidGridItem.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/item/WirelessFluidGridItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/WirelessFluidGridItem.java index 8304a34bc..244d5c12d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/WirelessFluidGridItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/WirelessFluidGridItem.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.api.network.item.INetworkItem; -import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemManager; -import com.raoulvdberge.refinedstorage.apiimpl.network.item.WirelessFluidGridNetworkItem; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.GridNetworkNode; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.api.network.item.INetworkItem; +import com.refinedmods.refinedstorage.api.network.item.INetworkItemManager; +import com.refinedmods.refinedstorage.apiimpl.network.item.WirelessFluidGridNetworkItem; +import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/WirelessGridItem.java b/src/main/java/com/refinedmods/refinedstorage/item/WirelessGridItem.java similarity index 84% rename from src/main/java/com/raoulvdberge/refinedstorage/item/WirelessGridItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/WirelessGridItem.java index a6cd32d64..46115bfbb 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/WirelessGridItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/WirelessGridItem.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.api.network.item.INetworkItem; -import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemManager; -import com.raoulvdberge.refinedstorage.apiimpl.network.item.WirelessGridNetworkItem; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.GridNetworkNode; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.api.network.item.INetworkItem; +import com.refinedmods.refinedstorage.api.network.item.INetworkItemManager; +import com.refinedmods.refinedstorage.apiimpl.network.item.WirelessGridNetworkItem; +import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/WrenchItem.java b/src/main/java/com/refinedmods/refinedstorage/item/WrenchItem.java similarity index 78% rename from src/main/java/com/raoulvdberge/refinedstorage/item/WrenchItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/WrenchItem.java index 3747ff362..230c46e53 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/WrenchItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/WrenchItem.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.item; +package com.refinedmods.refinedstorage.item; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.block.BlockState; import net.minecraft.item.Item; import net.minecraft.item.ItemUseContext; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/BaseBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/BaseBlockItem.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/BaseBlockItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/blockitem/BaseBlockItem.java index 52bd79f97..47f0291e2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/BaseBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/BaseBlockItem.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.item.blockitem; +package com.refinedmods.refinedstorage.item.blockitem; -import com.raoulvdberge.refinedstorage.block.BaseBlock; -import com.raoulvdberge.refinedstorage.block.BlockDirection; +import com.refinedmods.refinedstorage.block.BaseBlock; +import com.refinedmods.refinedstorage.block.BlockDirection; import net.minecraft.block.BlockState; import net.minecraft.item.BlockItem; import net.minecraft.item.BlockItemUseContext; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/ControllerBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/ControllerBlockItem.java similarity index 76% rename from src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/ControllerBlockItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/blockitem/ControllerBlockItem.java index 89c874386..3c24f17e9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/ControllerBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/ControllerBlockItem.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.item.blockitem; +package com.refinedmods.refinedstorage.item.blockitem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.NetworkType; -import com.raoulvdberge.refinedstorage.apiimpl.network.Network; -import com.raoulvdberge.refinedstorage.block.ControllerBlock; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.NetworkType; +import com.refinedmods.refinedstorage.apiimpl.network.Network; +import com.refinedmods.refinedstorage.block.ControllerBlock; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraftforge.energy.CapabilityEnergy; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/EnergyBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/EnergyBlockItem.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/EnergyBlockItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/blockitem/EnergyBlockItem.java index b5539d27a..37836019e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/EnergyBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/EnergyBlockItem.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.item.blockitem; +package com.refinedmods.refinedstorage.item.blockitem; -import com.raoulvdberge.refinedstorage.block.BaseBlock; -import com.raoulvdberge.refinedstorage.item.capabilityprovider.EnergyCapabilityProvider; -import com.raoulvdberge.refinedstorage.render.Styles; +import com.refinedmods.refinedstorage.block.BaseBlock; +import com.refinedmods.refinedstorage.item.capabilityprovider.EnergyCapabilityProvider; +import com.refinedmods.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/FluidStorageBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/FluidStorageBlockItem.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/FluidStorageBlockItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/blockitem/FluidStorageBlockItem.java index 18a04ae2f..c1ac22dab 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/FluidStorageBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/FluidStorageBlockItem.java @@ -1,16 +1,16 @@ -package com.raoulvdberge.refinedstorage.item.blockitem; +package com.refinedmods.refinedstorage.item.blockitem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSBlocks; -import com.raoulvdberge.refinedstorage.RSItems; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.StorageDiskSyncData; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.FluidStorageNetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.storage.FluidStorageType; -import com.raoulvdberge.refinedstorage.block.FluidStorageBlock; -import com.raoulvdberge.refinedstorage.item.FluidStoragePartItem; -import com.raoulvdberge.refinedstorage.render.Styles; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSBlocks; +import com.refinedmods.refinedstorage.RSItems; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.StorageDiskSyncData; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.network.node.storage.FluidStorageNetworkNode; +import com.refinedmods.refinedstorage.apiimpl.storage.FluidStorageType; +import com.refinedmods.refinedstorage.block.FluidStorageBlock; +import com.refinedmods.refinedstorage.item.FluidStoragePartItem; +import com.refinedmods.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.InventoryHelper; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/PortableGridBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/PortableGridBlockItem.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/PortableGridBlockItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/blockitem/PortableGridBlockItem.java index 4efc88d18..c738a355d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/PortableGridBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/PortableGridBlockItem.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.item.blockitem; +package com.refinedmods.refinedstorage.item.blockitem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSBlocks; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.network.grid.factory.PortableGridGridFactory; -import com.raoulvdberge.refinedstorage.item.WirelessGridItem; -import com.raoulvdberge.refinedstorage.render.Styles; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSBlocks; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.network.grid.factory.PortableGridGridFactory; +import com.refinedmods.refinedstorage.item.WirelessGridItem; +import com.refinedmods.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/StorageBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/StorageBlockItem.java similarity index 84% rename from src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/StorageBlockItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/blockitem/StorageBlockItem.java index d8d35a609..8c0ddcebc 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/StorageBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/StorageBlockItem.java @@ -1,16 +1,15 @@ -package com.raoulvdberge.refinedstorage.item.blockitem; +package com.refinedmods.refinedstorage.item.blockitem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSBlocks; -import com.raoulvdberge.refinedstorage.RSItems; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.StorageDiskSyncData; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.storage.ItemStorageType; -import com.raoulvdberge.refinedstorage.block.StorageBlock; -import com.raoulvdberge.refinedstorage.item.StoragePartItem; -import com.raoulvdberge.refinedstorage.render.Styles; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSBlocks; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.StorageDiskSyncData; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode; +import com.refinedmods.refinedstorage.apiimpl.storage.ItemStorageType; +import com.refinedmods.refinedstorage.block.StorageBlock; +import com.refinedmods.refinedstorage.item.StoragePartItem; +import com.refinedmods.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.InventoryHelper; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/WirelessTransmitterBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/WirelessTransmitterBlockItem.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/WirelessTransmitterBlockItem.java rename to src/main/java/com/refinedmods/refinedstorage/item/blockitem/WirelessTransmitterBlockItem.java index 47bb3a92b..fa08536e0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/WirelessTransmitterBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/WirelessTransmitterBlockItem.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.item.blockitem; +package com.refinedmods.refinedstorage.item.blockitem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSBlocks; -import com.raoulvdberge.refinedstorage.render.Styles; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSBlocks; +import com.refinedmods.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/capabilityprovider/EnergyCapabilityProvider.java b/src/main/java/com/refinedmods/refinedstorage/item/capabilityprovider/EnergyCapabilityProvider.java similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/item/capabilityprovider/EnergyCapabilityProvider.java rename to src/main/java/com/refinedmods/refinedstorage/item/capabilityprovider/EnergyCapabilityProvider.java index 28e933bd9..b166df6b9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/capabilityprovider/EnergyCapabilityProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/capabilityprovider/EnergyCapabilityProvider.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.item.capabilityprovider; +package com.refinedmods.refinedstorage.item.capabilityprovider; -import com.raoulvdberge.refinedstorage.energy.ItemEnergyStorage; +import com.refinedmods.refinedstorage.energy.ItemEnergyStorage; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; import net.minecraftforge.common.capabilities.Capability; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/group/MainItemGroup.java b/src/main/java/com/refinedmods/refinedstorage/item/group/MainItemGroup.java similarity index 67% rename from src/main/java/com/raoulvdberge/refinedstorage/item/group/MainItemGroup.java rename to src/main/java/com/refinedmods/refinedstorage/item/group/MainItemGroup.java index bfe3f1724..93d2c9dd9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/group/MainItemGroup.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/group/MainItemGroup.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.item.group; +package com.refinedmods.refinedstorage.item.group; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSBlocks; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSBlocks; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/loottable/ControllerLootFunction.java b/src/main/java/com/refinedmods/refinedstorage/loottable/ControllerLootFunction.java similarity index 84% rename from src/main/java/com/raoulvdberge/refinedstorage/loottable/ControllerLootFunction.java rename to src/main/java/com/refinedmods/refinedstorage/loottable/ControllerLootFunction.java index da0ff5d67..c66d9d5b1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/loottable/ControllerLootFunction.java +++ b/src/main/java/com/refinedmods/refinedstorage/loottable/ControllerLootFunction.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.loottable; +package com.refinedmods.refinedstorage.loottable; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.tile.ControllerTile; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.tile.ControllerTile; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.storage.loot.LootContext; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/loottable/ControllerLootFunctionSerializer.java b/src/main/java/com/refinedmods/refinedstorage/loottable/ControllerLootFunctionSerializer.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/loottable/ControllerLootFunctionSerializer.java rename to src/main/java/com/refinedmods/refinedstorage/loottable/ControllerLootFunctionSerializer.java index 9882e50ce..3d68d99d9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/loottable/ControllerLootFunctionSerializer.java +++ b/src/main/java/com/refinedmods/refinedstorage/loottable/ControllerLootFunctionSerializer.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.loottable; +package com.refinedmods.refinedstorage.loottable; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; -import com.raoulvdberge.refinedstorage.RS; +import com.refinedmods.refinedstorage.RS; import net.minecraft.util.ResourceLocation; import net.minecraft.world.storage.loot.functions.ILootFunction; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/loottable/CrafterLootFunction.java b/src/main/java/com/refinedmods/refinedstorage/loottable/CrafterLootFunction.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/loottable/CrafterLootFunction.java rename to src/main/java/com/refinedmods/refinedstorage/loottable/CrafterLootFunction.java index 75230f203..ae6f43ce5 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/loottable/CrafterLootFunction.java +++ b/src/main/java/com/refinedmods/refinedstorage/loottable/CrafterLootFunction.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.loottable; +package com.refinedmods.refinedstorage.loottable; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.CrafterNetworkNode; -import com.raoulvdberge.refinedstorage.tile.CrafterTile; +import com.refinedmods.refinedstorage.apiimpl.network.node.CrafterNetworkNode; +import com.refinedmods.refinedstorage.tile.CrafterTile; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.storage.loot.LootContext; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/loottable/CrafterLootFunctionSerializer.java b/src/main/java/com/refinedmods/refinedstorage/loottable/CrafterLootFunctionSerializer.java similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/loottable/CrafterLootFunctionSerializer.java rename to src/main/java/com/refinedmods/refinedstorage/loottable/CrafterLootFunctionSerializer.java index a4b0e0571..25f4c78a5 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/loottable/CrafterLootFunctionSerializer.java +++ b/src/main/java/com/refinedmods/refinedstorage/loottable/CrafterLootFunctionSerializer.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.loottable; +package com.refinedmods.refinedstorage.loottable; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; -import com.raoulvdberge.refinedstorage.RS; +import com.refinedmods.refinedstorage.RS; import net.minecraft.util.ResourceLocation; import net.minecraft.world.storage.loot.functions.ILootFunction; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/loottable/PortableGridBlockLootFunction.java b/src/main/java/com/refinedmods/refinedstorage/loottable/PortableGridBlockLootFunction.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/loottable/PortableGridBlockLootFunction.java rename to src/main/java/com/refinedmods/refinedstorage/loottable/PortableGridBlockLootFunction.java index 9de61af77..999bc6ae2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/loottable/PortableGridBlockLootFunction.java +++ b/src/main/java/com/refinedmods/refinedstorage/loottable/PortableGridBlockLootFunction.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.loottable; +package com.refinedmods.refinedstorage.loottable; -import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGridTile; +import com.refinedmods.refinedstorage.tile.grid.portable.PortableGridTile; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.storage.loot.LootContext; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/loottable/PortableGridBlockLootFunctionSerializer.java b/src/main/java/com/refinedmods/refinedstorage/loottable/PortableGridBlockLootFunctionSerializer.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/loottable/PortableGridBlockLootFunctionSerializer.java rename to src/main/java/com/refinedmods/refinedstorage/loottable/PortableGridBlockLootFunctionSerializer.java index 10ef69801..488f3b7bf 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/loottable/PortableGridBlockLootFunctionSerializer.java +++ b/src/main/java/com/refinedmods/refinedstorage/loottable/PortableGridBlockLootFunctionSerializer.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.loottable; +package com.refinedmods.refinedstorage.loottable; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; -import com.raoulvdberge.refinedstorage.RS; +import com.refinedmods.refinedstorage.RS; import net.minecraft.util.ResourceLocation; import net.minecraft.world.storage.loot.functions.ILootFunction; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/loottable/StorageBlockLootFunction.java b/src/main/java/com/refinedmods/refinedstorage/loottable/StorageBlockLootFunction.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/loottable/StorageBlockLootFunction.java rename to src/main/java/com/refinedmods/refinedstorage/loottable/StorageBlockLootFunction.java index 1eb65b5b0..5738e2a15 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/loottable/StorageBlockLootFunction.java +++ b/src/main/java/com/refinedmods/refinedstorage/loottable/StorageBlockLootFunction.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.loottable; +package com.refinedmods.refinedstorage.loottable; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.FluidStorageNetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode; -import com.raoulvdberge.refinedstorage.tile.FluidStorageTile; -import com.raoulvdberge.refinedstorage.tile.StorageTile; +import com.refinedmods.refinedstorage.apiimpl.network.node.storage.FluidStorageNetworkNode; +import com.refinedmods.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode; +import com.refinedmods.refinedstorage.tile.FluidStorageTile; +import com.refinedmods.refinedstorage.tile.StorageTile; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/loottable/StorageBlockLootFunctionSerializer.java b/src/main/java/com/refinedmods/refinedstorage/loottable/StorageBlockLootFunctionSerializer.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/loottable/StorageBlockLootFunctionSerializer.java rename to src/main/java/com/refinedmods/refinedstorage/loottable/StorageBlockLootFunctionSerializer.java index 26a9696da..ac435e844 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/loottable/StorageBlockLootFunctionSerializer.java +++ b/src/main/java/com/refinedmods/refinedstorage/loottable/StorageBlockLootFunctionSerializer.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.loottable; +package com.refinedmods.refinedstorage.loottable; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; -import com.raoulvdberge.refinedstorage.RS; +import com.refinedmods.refinedstorage.RS; import net.minecraft.util.ResourceLocation; import net.minecraft.world.storage.loot.functions.ILootFunction; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/ClientProxy.java b/src/main/java/com/refinedmods/refinedstorage/network/ClientProxy.java similarity index 69% rename from src/main/java/com/raoulvdberge/refinedstorage/network/ClientProxy.java rename to src/main/java/com/refinedmods/refinedstorage/network/ClientProxy.java index 801e5a3a8..3ce38169c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/ClientProxy.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/ClientProxy.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.network; +package com.refinedmods.refinedstorage.network; -import com.raoulvdberge.refinedstorage.network.craftingmonitor.CraftingMonitorUpdateMessage; -import com.raoulvdberge.refinedstorage.network.grid.GridCraftingPreviewResponseMessage; -import com.raoulvdberge.refinedstorage.network.grid.GridCraftingStartResponseMessage; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.CraftingMonitorScreen; -import com.raoulvdberge.refinedstorage.screen.grid.CraftingPreviewScreen; -import com.raoulvdberge.refinedstorage.screen.grid.CraftingSettingsScreen; +import com.refinedmods.refinedstorage.network.craftingmonitor.CraftingMonitorUpdateMessage; +import com.refinedmods.refinedstorage.network.grid.GridCraftingPreviewResponseMessage; +import com.refinedmods.refinedstorage.network.grid.GridCraftingStartResponseMessage; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.CraftingMonitorScreen; +import com.refinedmods.refinedstorage.screen.grid.CraftingPreviewScreen; +import com.refinedmods.refinedstorage.screen.grid.CraftingSettingsScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.Screen; import net.minecraft.util.text.TranslationTextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/FilterUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/FilterUpdateMessage.java similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/network/FilterUpdateMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/FilterUpdateMessage.java index 3566ba53e..34c387fff 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/FilterUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/FilterUpdateMessage.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.network; +package com.refinedmods.refinedstorage.network; -import com.raoulvdberge.refinedstorage.container.FilterContainer; -import com.raoulvdberge.refinedstorage.item.FilterItem; -import com.raoulvdberge.refinedstorage.util.PacketBufferUtils; +import com.refinedmods.refinedstorage.container.FilterContainer; +import com.refinedmods.refinedstorage.item.FilterItem; +import com.refinedmods.refinedstorage.util.PacketBufferUtils; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/FluidFilterSlotUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/FluidFilterSlotUpdateMessage.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/network/FluidFilterSlotUpdateMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/FluidFilterSlotUpdateMessage.java index aa42296cf..053244e62 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/FluidFilterSlotUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/FluidFilterSlotUpdateMessage.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.network; +package com.refinedmods.refinedstorage.network; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.inventory.container.Slot; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/NetworkHandler.java b/src/main/java/com/refinedmods/refinedstorage/network/NetworkHandler.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/network/NetworkHandler.java rename to src/main/java/com/refinedmods/refinedstorage/network/NetworkHandler.java index 0958e660e..b8eda8e5f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/NetworkHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/NetworkHandler.java @@ -1,14 +1,14 @@ -package com.raoulvdberge.refinedstorage.network; +package com.refinedmods.refinedstorage.network; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.network.craftingmonitor.CraftingMonitorCancelMessage; -import com.raoulvdberge.refinedstorage.network.craftingmonitor.CraftingMonitorUpdateMessage; -import com.raoulvdberge.refinedstorage.network.craftingmonitor.WirelessCraftingMonitorSettingsUpdateMessage; -import com.raoulvdberge.refinedstorage.network.disk.StorageDiskSizeRequestMessage; -import com.raoulvdberge.refinedstorage.network.disk.StorageDiskSizeResponseMessage; -import com.raoulvdberge.refinedstorage.network.grid.*; -import com.raoulvdberge.refinedstorage.network.tiledata.TileDataParameterMessage; -import com.raoulvdberge.refinedstorage.network.tiledata.TileDataParameterUpdateMessage; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.network.craftingmonitor.CraftingMonitorCancelMessage; +import com.refinedmods.refinedstorage.network.craftingmonitor.CraftingMonitorUpdateMessage; +import com.refinedmods.refinedstorage.network.craftingmonitor.WirelessCraftingMonitorSettingsUpdateMessage; +import com.refinedmods.refinedstorage.network.disk.StorageDiskSizeRequestMessage; +import com.refinedmods.refinedstorage.network.disk.StorageDiskSizeResponseMessage; +import com.refinedmods.refinedstorage.network.grid.*; +import com.refinedmods.refinedstorage.network.tiledata.TileDataParameterMessage; +import com.refinedmods.refinedstorage.network.tiledata.TileDataParameterUpdateMessage; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.FakePlayer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/OpenNetworkItemMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/OpenNetworkItemMessage.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/network/OpenNetworkItemMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/OpenNetworkItemMessage.java index 6be9131d8..410e751fa 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/OpenNetworkItemMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/OpenNetworkItemMessage.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.network; +package com.refinedmods.refinedstorage.network; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.network.grid.factory.PortableGridGridFactory; -import com.raoulvdberge.refinedstorage.item.NetworkItem; -import com.raoulvdberge.refinedstorage.item.blockitem.PortableGridBlockItem; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.network.grid.factory.PortableGridGridFactory; +import com.refinedmods.refinedstorage.item.NetworkItem; +import com.refinedmods.refinedstorage.item.blockitem.PortableGridBlockItem; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/SecurityManagerUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/SecurityManagerUpdateMessage.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/network/SecurityManagerUpdateMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/SecurityManagerUpdateMessage.java index c87cdbf66..49ef8787b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/SecurityManagerUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/SecurityManagerUpdateMessage.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.network; +package com.refinedmods.refinedstorage.network; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.tile.SecurityManagerTile; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.tile.SecurityManagerTile; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/SetFilterSlotMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/SetFilterSlotMessage.java similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/network/SetFilterSlotMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/SetFilterSlotMessage.java index fba6cd406..81e854dee 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/SetFilterSlotMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/SetFilterSlotMessage.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.network; +package com.refinedmods.refinedstorage.network; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.legacy.LegacyFilterSlot; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; +import com.refinedmods.refinedstorage.container.slot.legacy.LegacyFilterSlot; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.Slot; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/SetFluidFilterSlotMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/SetFluidFilterSlotMessage.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/network/SetFluidFilterSlotMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/SetFluidFilterSlotMessage.java index 89d6a77dd..2ef0b318e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/SetFluidFilterSlotMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/SetFluidFilterSlotMessage.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.network; +package com.refinedmods.refinedstorage.network; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.Slot; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/craftingmonitor/CraftingMonitorCancelMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorCancelMessage.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/network/craftingmonitor/CraftingMonitorCancelMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorCancelMessage.java index 5a12e1543..3cd8d135d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/craftingmonitor/CraftingMonitorCancelMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorCancelMessage.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.network.craftingmonitor; +package com.refinedmods.refinedstorage.network.craftingmonitor; -import com.raoulvdberge.refinedstorage.container.CraftingMonitorContainer; +import com.refinedmods.refinedstorage.container.CraftingMonitorContainer; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/craftingmonitor/CraftingMonitorUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorUpdateMessage.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/network/craftingmonitor/CraftingMonitorUpdateMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorUpdateMessage.java index 150d29182..6cce3929f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/craftingmonitor/CraftingMonitorUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorUpdateMessage.java @@ -1,14 +1,14 @@ -package com.raoulvdberge.refinedstorage.network.craftingmonitor; +package com.refinedmods.refinedstorage.network.craftingmonitor; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; -import com.raoulvdberge.refinedstorage.api.network.grid.IGridTab; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.network.ClientProxy; -import com.raoulvdberge.refinedstorage.screen.CraftingMonitorScreen; -import com.raoulvdberge.refinedstorage.tile.craftingmonitor.ICraftingMonitor; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; +import com.refinedmods.refinedstorage.api.autocrafting.task.CraftingTaskReadException; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTask; +import com.refinedmods.refinedstorage.api.network.grid.IGridTab; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.network.ClientProxy; +import com.refinedmods.refinedstorage.screen.CraftingMonitorScreen; +import com.refinedmods.refinedstorage.tile.craftingmonitor.ICraftingMonitor; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/craftingmonitor/WirelessCraftingMonitorSettingsUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/WirelessCraftingMonitorSettingsUpdateMessage.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/network/craftingmonitor/WirelessCraftingMonitorSettingsUpdateMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/WirelessCraftingMonitorSettingsUpdateMessage.java index a095f1306..2af1e8a39 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/craftingmonitor/WirelessCraftingMonitorSettingsUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/WirelessCraftingMonitorSettingsUpdateMessage.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.network.craftingmonitor; +package com.refinedmods.refinedstorage.network.craftingmonitor; -import com.raoulvdberge.refinedstorage.container.CraftingMonitorContainer; -import com.raoulvdberge.refinedstorage.tile.craftingmonitor.WirelessCraftingMonitor; +import com.refinedmods.refinedstorage.container.CraftingMonitorContainer; +import com.refinedmods.refinedstorage.tile.craftingmonitor.WirelessCraftingMonitor; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/disk/StorageDiskSizeRequestMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeRequestMessage.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/network/disk/StorageDiskSizeRequestMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeRequestMessage.java index f7ab7a23b..4fe9ea476 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/disk/StorageDiskSizeRequestMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeRequestMessage.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.network.disk; +package com.refinedmods.refinedstorage.network.disk; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/disk/StorageDiskSizeResponseMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeResponseMessage.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/network/disk/StorageDiskSizeResponseMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeResponseMessage.java index 42d84a622..19e7a41c5 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/disk/StorageDiskSizeResponseMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeResponseMessage.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.network.disk; +package com.refinedmods.refinedstorage.network.disk; -import com.raoulvdberge.refinedstorage.api.storage.disk.StorageDiskSyncData; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskSync; +import com.refinedmods.refinedstorage.api.storage.disk.StorageDiskSyncData; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.storage.disk.StorageDiskSync; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridClearMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridClearMessage.java similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridClearMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/GridClearMessage.java index 49c23897d..23565cf96 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridClearMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridClearMessage.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.Container; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridCraftingPreviewRequestMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewRequestMessage.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridCraftingPreviewRequestMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewRequestMessage.java index 782a7e538..37fd960e6 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridCraftingPreviewRequestMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewRequestMessage.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.container.GridContainer; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.Container; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridCraftingPreviewResponseMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewResponseMessage.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridCraftingPreviewResponseMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewResponseMessage.java index ceb28d804..e38f7d7a5 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridCraftingPreviewResponseMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewResponseMessage.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.network.ClientProxy; +import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.network.ClientProxy; import net.minecraft.network.PacketBuffer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.network.NetworkEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridCraftingStartRequestMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartRequestMessage.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridCraftingStartRequestMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartRequestMessage.java index dc4625352..2a0c3f661 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridCraftingStartRequestMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartRequestMessage.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.container.GridContainer; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.Container; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridCraftingStartResponseMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartResponseMessage.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridCraftingStartResponseMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartResponseMessage.java index 999ddc876..8c0bb3d7a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridCraftingStartResponseMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartResponseMessage.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.network.ClientProxy; +import com.refinedmods.refinedstorage.network.ClientProxy; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridFluidDeltaMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidDeltaMessage.java similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridFluidDeltaMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidDeltaMessage.java index 8e2ee530e..5f04b39d7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridFluidDeltaMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidDeltaMessage.java @@ -1,13 +1,13 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.api.util.StackListEntry; -import com.raoulvdberge.refinedstorage.api.util.StackListResult; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.api.util.StackListEntry; +import com.refinedmods.refinedstorage.api.util.StackListResult; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.grid.GridScreen; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.network.NetworkEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridFluidInsertHeldMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidInsertHeldMessage.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridFluidInsertHeldMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidInsertHeldMessage.java index 8ce43f323..873b477db 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridFluidInsertHeldMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidInsertHeldMessage.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.container.GridContainer; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.Container; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridFluidPullMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidPullMessage.java similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridFluidPullMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidPullMessage.java index 0b163907a..58d784cf1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridFluidPullMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidPullMessage.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.container.GridContainer; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.Container; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridFluidUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidUpdateMessage.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridFluidUpdateMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidUpdateMessage.java index 7ac883a26..b53529bb6 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridFluidUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidUpdateMessage.java @@ -1,13 +1,13 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.api.util.StackListEntry; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; -import com.raoulvdberge.refinedstorage.screen.grid.view.FluidGridView; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.api.util.StackListEntry; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.grid.GridScreen; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.screen.grid.view.FluidGridView; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.network.NetworkEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridItemDeltaMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemDeltaMessage.java similarity index 79% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridItemDeltaMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemDeltaMessage.java index d1b23790c..ebbfb3916 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridItemDeltaMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemDeltaMessage.java @@ -1,13 +1,13 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.api.util.StackListEntry; -import com.raoulvdberge.refinedstorage.api.util.StackListResult; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.api.util.StackListEntry; +import com.refinedmods.refinedstorage.api.util.StackListResult; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.grid.GridScreen; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridItemInsertHeldMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInsertHeldMessage.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridItemInsertHeldMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInsertHeldMessage.java index a60dd275a..e12a4b5e4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridItemInsertHeldMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInsertHeldMessage.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.container.GridContainer; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.Container; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridItemPullMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemPullMessage.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridItemPullMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemPullMessage.java index ee81b3c41..5325f9fbc 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridItemPullMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemPullMessage.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.container.GridContainer; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.Container; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridItemUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemUpdateMessage.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridItemUpdateMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemUpdateMessage.java index 211b60756..77106e7e4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridItemUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemUpdateMessage.java @@ -1,13 +1,13 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.api.util.StackListEntry; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; -import com.raoulvdberge.refinedstorage.screen.grid.view.ItemGridView; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.api.util.StackListEntry; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.grid.GridScreen; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.screen.grid.view.ItemGridView; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridPatternCreateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridPatternCreateMessage.java similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridPatternCreateMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/GridPatternCreateMessage.java index 6393caaaf..1afea290f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridPatternCreateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridPatternCreateMessage.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.network.grid.GridType; -import com.raoulvdberge.refinedstorage.tile.grid.GridTile; +import com.refinedmods.refinedstorage.api.network.grid.GridType; +import com.refinedmods.refinedstorage.tile.grid.GridTile; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridProcessingTransferMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridProcessingTransferMessage.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridProcessingTransferMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/GridProcessingTransferMessage.java index 7d48d286e..c5c4c6333 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridProcessingTransferMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridProcessingTransferMessage.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.network.grid.GridType; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.GridNetworkNode; -import com.raoulvdberge.refinedstorage.container.GridContainer; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.api.network.grid.GridType; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; +import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridTransferMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridTransferMessage.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridTransferMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/GridTransferMessage.java index 47c6cbd31..74b28c9f7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridTransferMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridTransferMessage.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.network.grid.GridType; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.container.GridContainer; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.api.network.grid.GridType; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.util.StackUtils; import mezz.jei.api.gui.ingredient.IGuiIngredient; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.Slot; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/PortableGridFluidDeltaMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridFluidDeltaMessage.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/PortableGridFluidDeltaMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridFluidDeltaMessage.java index 4fa83b3d5..e40cf14ba 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/PortableGridFluidDeltaMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridFluidDeltaMessage.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.util.StackListResult; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; -import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.api.util.StackListResult; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.grid.GridScreen; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.network.NetworkEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/PortableGridFluidUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridFluidUpdateMessage.java similarity index 78% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/PortableGridFluidUpdateMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridFluidUpdateMessage.java index 34d0d5313..6d7d12a63 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/PortableGridFluidUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridFluidUpdateMessage.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.util.StackListEntry; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; -import com.raoulvdberge.refinedstorage.screen.grid.view.FluidGridView; -import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.api.util.StackListEntry; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.grid.GridScreen; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.screen.grid.view.FluidGridView; +import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.network.NetworkEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/PortableGridItemDeltaMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridItemDeltaMessage.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/PortableGridItemDeltaMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridItemDeltaMessage.java index 4973f32fc..086bc500b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/PortableGridItemDeltaMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridItemDeltaMessage.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.util.StackListResult; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; -import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.api.util.StackListResult; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.grid.GridScreen; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/PortableGridItemUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridItemUpdateMessage.java similarity index 78% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/PortableGridItemUpdateMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridItemUpdateMessage.java index e5aacecda..a570cb594 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/PortableGridItemUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridItemUpdateMessage.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.util.StackListEntry; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; -import com.raoulvdberge.refinedstorage.screen.grid.view.ItemGridView; -import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.api.util.StackListEntry; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.grid.GridScreen; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.screen.grid.view.ItemGridView; +import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/PortableGridSettingsUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridSettingsUpdateMessage.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/PortableGridSettingsUpdateMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridSettingsUpdateMessage.java index 2108fdd17..660f3f7e2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/PortableGridSettingsUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridSettingsUpdateMessage.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.GridNetworkNode; -import com.raoulvdberge.refinedstorage.container.GridContainer; -import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGrid; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; +import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.tile.grid.portable.PortableGrid; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/WirelessFluidGridSettingsUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessFluidGridSettingsUpdateMessage.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/WirelessFluidGridSettingsUpdateMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessFluidGridSettingsUpdateMessage.java index dc291a97a..1eff899e3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/WirelessFluidGridSettingsUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessFluidGridSettingsUpdateMessage.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.GridNetworkNode; -import com.raoulvdberge.refinedstorage.container.GridContainer; -import com.raoulvdberge.refinedstorage.tile.grid.WirelessFluidGrid; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; +import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.tile.grid.WirelessFluidGrid; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/WirelessGridSettingsUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessGridSettingsUpdateMessage.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/network/grid/WirelessGridSettingsUpdateMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessGridSettingsUpdateMessage.java index b6f41f470..e440dc0ed 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/WirelessGridSettingsUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessGridSettingsUpdateMessage.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.network.grid; +package com.refinedmods.refinedstorage.network.grid; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.GridNetworkNode; -import com.raoulvdberge.refinedstorage.container.GridContainer; -import com.raoulvdberge.refinedstorage.tile.grid.WirelessGrid; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; +import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.tile.grid.WirelessGrid; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/tiledata/TileDataParameterMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterMessage.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/network/tiledata/TileDataParameterMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterMessage.java index a5d212d6d..e0b5c8c19 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/tiledata/TileDataParameterMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterMessage.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.network.tiledata; +package com.refinedmods.refinedstorage.network.tiledata; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.network.NetworkEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/tiledata/TileDataParameterUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterUpdateMessage.java similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/network/tiledata/TileDataParameterUpdateMessage.java rename to src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterUpdateMessage.java index 069024938..a1fb8e33a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/tiledata/TileDataParameterUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterUpdateMessage.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.network.tiledata; +package com.refinedmods.refinedstorage.network.tiledata; -import com.raoulvdberge.refinedstorage.container.BaseContainer; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.container.BaseContainer; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.inventory.container.Container; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java b/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java similarity index 96% rename from src/main/java/com/raoulvdberge/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java rename to src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java index c12d89483..695038c6f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java +++ b/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.recipe; +package com.refinedmods.refinedstorage.recipe; -import com.raoulvdberge.refinedstorage.RSItems; +import com.refinedmods.refinedstorage.RSItems; import net.minecraft.block.Blocks; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentData; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/recipe/UpgradeWithEnchantedBookRecipeSerializer.java b/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipeSerializer.java similarity index 97% rename from src/main/java/com/raoulvdberge/refinedstorage/recipe/UpgradeWithEnchantedBookRecipeSerializer.java rename to src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipeSerializer.java index af99a7c5d..4ee989c0a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/recipe/UpgradeWithEnchantedBookRecipeSerializer.java +++ b/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipeSerializer.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.recipe; +package com.refinedmods.refinedstorage.recipe; import com.google.gson.JsonObject; import net.minecraft.enchantment.Enchantment; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelOverrideRegistry.java b/src/main/java/com/refinedmods/refinedstorage/render/BakedModelOverrideRegistry.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelOverrideRegistry.java rename to src/main/java/com/refinedmods/refinedstorage/render/BakedModelOverrideRegistry.java index 9635321a1..c5fdcefb1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelOverrideRegistry.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/BakedModelOverrideRegistry.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.render; +package com.refinedmods.refinedstorage.render; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/FluidRenderer.java b/src/main/java/com/refinedmods/refinedstorage/render/FluidRenderer.java similarity index 99% rename from src/main/java/com/raoulvdberge/refinedstorage/render/FluidRenderer.java rename to src/main/java/com/refinedmods/refinedstorage/render/FluidRenderer.java index 42f69890f..5f6fcdd2b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/FluidRenderer.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/FluidRenderer.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.render; +package com.refinedmods.refinedstorage.render; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/RenderSettings.java b/src/main/java/com/refinedmods/refinedstorage/render/RenderSettings.java similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/render/RenderSettings.java rename to src/main/java/com/refinedmods/refinedstorage/render/RenderSettings.java index a869e008f..ca0b6bdae 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/RenderSettings.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/RenderSettings.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.render; +package com.refinedmods.refinedstorage.render; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/Styles.java b/src/main/java/com/refinedmods/refinedstorage/render/Styles.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/render/Styles.java rename to src/main/java/com/refinedmods/refinedstorage/render/Styles.java index 01b1e0c7d..781699613 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/Styles.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/Styles.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.render; +package com.refinedmods.refinedstorage.render; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/color/PatternItemColor.java b/src/main/java/com/refinedmods/refinedstorage/render/color/PatternItemColor.java similarity index 71% rename from src/main/java/com/raoulvdberge/refinedstorage/render/color/PatternItemColor.java rename to src/main/java/com/refinedmods/refinedstorage/render/color/PatternItemColor.java index 6cd9a8276..4e069c705 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/color/PatternItemColor.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/color/PatternItemColor.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.render.color; +package com.refinedmods.refinedstorage.render.color; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPattern; -import com.raoulvdberge.refinedstorage.item.PatternItem; -import com.raoulvdberge.refinedstorage.render.model.PatternBakedModel; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.CraftingPattern; +import com.refinedmods.refinedstorage.item.PatternItem; +import com.refinedmods.refinedstorage.render.model.PatternBakedModel; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/DelegateBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/DelegateBakedModel.java similarity index 97% rename from src/main/java/com/raoulvdberge/refinedstorage/render/model/DelegateBakedModel.java rename to src/main/java/com/refinedmods/refinedstorage/render/model/DelegateBakedModel.java index bf4e45d87..2786b793c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/DelegateBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/DelegateBakedModel.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.render.model; +package com.refinedmods.refinedstorage.render.model; import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/DiskDriveBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/DiskDriveBakedModel.java similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/render/model/DiskDriveBakedModel.java rename to src/main/java/com/refinedmods/refinedstorage/render/model/DiskDriveBakedModel.java index 675cd8a2d..2253f69a0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/DiskDriveBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/DiskDriveBakedModel.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.render.model; +package com.refinedmods.refinedstorage.render.model; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import com.raoulvdberge.refinedstorage.RSBlocks; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.DiskState; -import com.raoulvdberge.refinedstorage.tile.DiskDriveTile; +import com.refinedmods.refinedstorage.RSBlocks; +import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState; +import com.refinedmods.refinedstorage.tile.DiskDriveTile; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.BakedQuad; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/DiskManipulatorBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/DiskManipulatorBakedModel.java similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/render/model/DiskManipulatorBakedModel.java rename to src/main/java/com/refinedmods/refinedstorage/render/model/DiskManipulatorBakedModel.java index acaa2c892..98cb6a39b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/DiskManipulatorBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/DiskManipulatorBakedModel.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.render.model; +package com.refinedmods.refinedstorage.render.model; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import com.raoulvdberge.refinedstorage.RSBlocks; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.DiskState; -import com.raoulvdberge.refinedstorage.block.DiskManipulatorBlock; -import com.raoulvdberge.refinedstorage.tile.DiskManipulatorTile; +import com.refinedmods.refinedstorage.RSBlocks; +import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState; +import com.refinedmods.refinedstorage.block.DiskManipulatorBlock; +import com.refinedmods.refinedstorage.tile.DiskManipulatorTile; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.TransformationMatrix; import net.minecraft.client.renderer.Vector3f; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/FullbrightBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/FullbrightBakedModel.java similarity index 98% rename from src/main/java/com/raoulvdberge/refinedstorage/render/model/FullbrightBakedModel.java rename to src/main/java/com/refinedmods/refinedstorage/render/model/FullbrightBakedModel.java index 4951dc39f..52d604077 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/FullbrightBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/FullbrightBakedModel.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.render.model; +package com.refinedmods.refinedstorage.render.model; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/PatternBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/PatternBakedModel.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/render/model/PatternBakedModel.java rename to src/main/java/com/refinedmods/refinedstorage/render/model/PatternBakedModel.java index e6245428d..a3d5b8c07 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/PatternBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/PatternBakedModel.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.render.model; +package com.refinedmods.refinedstorage.render.model; import com.google.common.collect.ImmutableList; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternRenderHandler; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPattern; -import com.raoulvdberge.refinedstorage.item.PatternItem; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternRenderHandler; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.CraftingPattern; +import com.refinedmods.refinedstorage.item.PatternItem; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.ItemOverride; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/PortableGridBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridBakedModel.java similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/render/model/PortableGridBakedModel.java rename to src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridBakedModel.java index aa1f1fdde..39113a394 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/PortableGridBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridBakedModel.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.render.model; +package com.refinedmods.refinedstorage.render.model; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import com.raoulvdberge.refinedstorage.RSBlocks; -import com.raoulvdberge.refinedstorage.block.PortableGridBlock; -import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGrid; -import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGridDiskState; +import com.refinedmods.refinedstorage.RSBlocks; +import com.refinedmods.refinedstorage.block.PortableGridBlock; +import com.refinedmods.refinedstorage.tile.grid.portable.PortableGrid; +import com.refinedmods.refinedstorage.tile.grid.portable.PortableGridDiskState; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.model.BakedQuad; import net.minecraft.client.renderer.model.IBakedModel; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/PortableGridItemBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridItemBakedModel.java similarity index 97% rename from src/main/java/com/raoulvdberge/refinedstorage/render/model/PortableGridItemBakedModel.java rename to src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridItemBakedModel.java index 77fa838bf..3e9319cb0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/PortableGridItemBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridItemBakedModel.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.render.model; +package com.refinedmods.refinedstorage.render.model; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.model.BakedQuad; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/TRSRBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/TRSRBakedModel.java similarity index 98% rename from src/main/java/com/raoulvdberge/refinedstorage/render/model/TRSRBakedModel.java rename to src/main/java/com/refinedmods/refinedstorage/render/model/TRSRBakedModel.java index 3f4076c7f..887228429 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/TRSRBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/TRSRBakedModel.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.render.model; +package com.refinedmods.refinedstorage.render.model; import com.google.common.collect.ImmutableList; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/resourcepack/RSResourcePackSection.java b/src/main/java/com/refinedmods/refinedstorage/render/resourcepack/RSResourcePackSection.java similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/render/resourcepack/RSResourcePackSection.java rename to src/main/java/com/refinedmods/refinedstorage/render/resourcepack/RSResourcePackSection.java index aa05ccdfc..cd860cf3d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/resourcepack/RSResourcePackSection.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/resourcepack/RSResourcePackSection.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.render.resourcepack; +package com.refinedmods.refinedstorage.render.resourcepack; public class RSResourcePackSection { public static final RSResourcePackSectionDeserializer DESERIALIZER = new RSResourcePackSectionDeserializer(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/resourcepack/RSResourcePackSectionDeserializer.java b/src/main/java/com/refinedmods/refinedstorage/render/resourcepack/RSResourcePackSectionDeserializer.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/render/resourcepack/RSResourcePackSectionDeserializer.java rename to src/main/java/com/refinedmods/refinedstorage/render/resourcepack/RSResourcePackSectionDeserializer.java index 14908cd03..261dc9ed8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/resourcepack/RSResourcePackSectionDeserializer.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/resourcepack/RSResourcePackSectionDeserializer.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.render.resourcepack; +package com.refinedmods.refinedstorage.render.resourcepack; import com.google.gson.JsonObject; import net.minecraft.resources.data.IMetadataSectionSerializer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/resourcepack/ResourcePackListener.java b/src/main/java/com/refinedmods/refinedstorage/render/resourcepack/ResourcePackListener.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/render/resourcepack/ResourcePackListener.java rename to src/main/java/com/refinedmods/refinedstorage/render/resourcepack/ResourcePackListener.java index fb832f7e6..11eedfa7c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/resourcepack/ResourcePackListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/resourcepack/ResourcePackListener.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.render.resourcepack; +package com.refinedmods.refinedstorage.render.resourcepack; -import com.raoulvdberge.refinedstorage.render.RenderSettings; +import com.refinedmods.refinedstorage.render.RenderSettings; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.ClientResourcePackInfo; import net.minecraft.client.resources.ReloadListener; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/tesr/PatternItemStackTileRenderer.java b/src/main/java/com/refinedmods/refinedstorage/render/tesr/PatternItemStackTileRenderer.java similarity index 79% rename from src/main/java/com/raoulvdberge/refinedstorage/render/tesr/PatternItemStackTileRenderer.java rename to src/main/java/com/refinedmods/refinedstorage/render/tesr/PatternItemStackTileRenderer.java index 50fd6b25c..cfbb23c0a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/tesr/PatternItemStackTileRenderer.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/tesr/PatternItemStackTileRenderer.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.render.tesr; +package com.refinedmods.refinedstorage.render.tesr; import com.mojang.blaze3d.matrix.MatrixStack; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPattern; -import com.raoulvdberge.refinedstorage.item.PatternItem; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.CraftingPattern; +import com.refinedmods.refinedstorage.item.PatternItem; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/tesr/StorageMonitorTileRenderer.java b/src/main/java/com/refinedmods/refinedstorage/render/tesr/StorageMonitorTileRenderer.java similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/render/tesr/StorageMonitorTileRenderer.java rename to src/main/java/com/refinedmods/refinedstorage/render/tesr/StorageMonitorTileRenderer.java index 1312782f4..ad80a85d3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/tesr/StorageMonitorTileRenderer.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/tesr/StorageMonitorTileRenderer.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.render.tesr; +package com.refinedmods.refinedstorage.render.tesr; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; -import com.raoulvdberge.refinedstorage.RSBlocks; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.block.StorageMonitorBlock; -import com.raoulvdberge.refinedstorage.tile.StorageMonitorTile; -import com.raoulvdberge.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.RSBlocks; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.block.StorageMonitorBlock; +import com.refinedmods.refinedstorage.tile.StorageMonitorTile; +import com.refinedmods.refinedstorage.tile.config.IType; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/AmountSpecifyingScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java similarity index 96% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/AmountSpecifyingScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java index 618acaf73..2bef8d677 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/AmountSpecifyingScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java @@ -1,8 +1,7 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.mojang.blaze3d.systems.RenderSystem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.render.RenderSettings; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.render.RenderSettings; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/BaseScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/BaseScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java index 23dc5114e..ca73852c3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/BaseScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java @@ -1,17 +1,17 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; import com.mojang.blaze3d.systems.RenderSystem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; -import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; -import com.raoulvdberge.refinedstorage.integration.craftingtweaks.CraftingTweaksIntegration; -import com.raoulvdberge.refinedstorage.render.FluidRenderer; -import com.raoulvdberge.refinedstorage.render.RenderSettings; -import com.raoulvdberge.refinedstorage.screen.grid.AlternativesScreen; -import com.raoulvdberge.refinedstorage.screen.widget.CheckboxWidget; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButton; -import com.raoulvdberge.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; +import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.refinedmods.refinedstorage.integration.craftingtweaks.CraftingTweaksIntegration; +import com.refinedmods.refinedstorage.render.FluidRenderer; +import com.refinedmods.refinedstorage.render.RenderSettings; +import com.refinedmods.refinedstorage.screen.grid.AlternativesScreen; +import com.refinedmods.refinedstorage.screen.widget.CheckboxWidget; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.SideButton; +import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.inventory.ContainerScreen; import net.minecraft.client.gui.widget.Widget; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/ConstructorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java similarity index 67% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/ConstructorScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java index 27b9a7821..c1c951587 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/ConstructorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.ConstructorContainer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.ConstructorDropSideButton; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.TypeSideButton; -import com.raoulvdberge.refinedstorage.tile.ConstructorTile; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.ConstructorContainer; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.ConstructorDropSideButton; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.TypeSideButton; +import com.refinedmods.refinedstorage.tile.ConstructorTile; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/ControllerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/ControllerScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java index ab1dd9014..09bc23142 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/ControllerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java @@ -1,16 +1,14 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.apiimpl.network.Network; -import com.raoulvdberge.refinedstorage.container.ControllerContainer; -import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; -import com.raoulvdberge.refinedstorage.tile.ClientNode; -import com.raoulvdberge.refinedstorage.tile.ControllerTile; -import com.raoulvdberge.refinedstorage.util.RenderUtils; -import net.minecraft.client.renderer.RenderHelper; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.apiimpl.network.Network; +import com.refinedmods.refinedstorage.container.ControllerContainer; +import com.refinedmods.refinedstorage.screen.widget.ScrollbarWidget; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; +import com.refinedmods.refinedstorage.tile.ClientNode; +import com.refinedmods.refinedstorage.tile.ControllerTile; +import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/CrafterManagerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/CrafterManagerScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java index 51a040d8c..f4d5c4a31 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/CrafterManagerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java @@ -1,19 +1,19 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; import com.mojang.blaze3d.systems.RenderSystem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.CrafterManagerNetworkNode; -import com.raoulvdberge.refinedstorage.container.CrafterManagerContainer; -import com.raoulvdberge.refinedstorage.container.slot.CrafterManagerSlot; -import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget; -import com.raoulvdberge.refinedstorage.screen.widget.SearchWidget; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.CrafterManagerSearchBoxModeSideButton; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.GridSizeSideButton; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; -import com.raoulvdberge.refinedstorage.tile.CrafterManagerTile; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; -import com.raoulvdberge.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.apiimpl.network.node.CrafterManagerNetworkNode; +import com.refinedmods.refinedstorage.container.CrafterManagerContainer; +import com.refinedmods.refinedstorage.container.slot.CrafterManagerSlot; +import com.refinedmods.refinedstorage.screen.widget.ScrollbarWidget; +import com.refinedmods.refinedstorage.screen.widget.SearchWidget; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.CrafterManagerSearchBoxModeSideButton; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.GridSizeSideButton; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; +import com.refinedmods.refinedstorage.tile.CrafterManagerTile; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Slot; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/CrafterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterScreen.java similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/CrafterScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/CrafterScreen.java index 24c4f6921..21feeb365 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/CrafterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterScreen.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.CrafterContainer; -import com.raoulvdberge.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.CrafterContainer; +import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/CrafterTileDataParameterClientListener.java b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterTileDataParameterClientListener.java similarity index 63% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/CrafterTileDataParameterClientListener.java rename to src/main/java/com/refinedmods/refinedstorage/screen/CrafterTileDataParameterClientListener.java index f98a6c908..046d741c9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/CrafterTileDataParameterClientListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterTileDataParameterClientListener.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.CrafterModeSideButton; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameterClientListener; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.CrafterModeSideButton; +import com.refinedmods.refinedstorage.tile.data.TileDataParameterClientListener; public class CrafterTileDataParameterClientListener implements TileDataParameterClientListener { @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/CraftingMonitorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/CraftingMonitorScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java index 98571c0ee..16dc4d3db 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/CraftingMonitorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java @@ -1,28 +1,26 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; import com.google.common.collect.Lists; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; -import com.raoulvdberge.refinedstorage.api.network.grid.IGridTab; -import com.raoulvdberge.refinedstorage.api.render.IElementDrawer; -import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; -import com.raoulvdberge.refinedstorage.api.util.IFilter; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.render.CraftingMonitorElementDrawers; -import com.raoulvdberge.refinedstorage.apiimpl.render.ElementDrawers; -import com.raoulvdberge.refinedstorage.container.CraftingMonitorContainer; -import com.raoulvdberge.refinedstorage.network.craftingmonitor.CraftingMonitorCancelMessage; -import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget; -import com.raoulvdberge.refinedstorage.screen.widget.TabListWidget; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; -import com.raoulvdberge.refinedstorage.tile.craftingmonitor.ICraftingMonitor; -import com.raoulvdberge.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; +import com.refinedmods.refinedstorage.api.network.grid.IGridTab; +import com.refinedmods.refinedstorage.api.render.IElementDrawer; +import com.refinedmods.refinedstorage.api.render.IElementDrawers; +import com.refinedmods.refinedstorage.api.util.IFilter; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.render.CraftingMonitorElementDrawers; +import com.refinedmods.refinedstorage.apiimpl.render.ElementDrawers; +import com.refinedmods.refinedstorage.container.CraftingMonitorContainer; +import com.refinedmods.refinedstorage.network.craftingmonitor.CraftingMonitorCancelMessage; +import com.refinedmods.refinedstorage.screen.widget.ScrollbarWidget; +import com.refinedmods.refinedstorage.screen.widget.TabListWidget; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; +import com.refinedmods.refinedstorage.tile.craftingmonitor.ICraftingMonitor; +import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/DestructorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/DestructorScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java index 8ff8ac11b..961077605 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/DestructorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.DestructorContainer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.*; -import com.raoulvdberge.refinedstorage.tile.DestructorTile; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.DestructorContainer; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.*; +import com.refinedmods.refinedstorage.tile.DestructorTile; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/DetectorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java similarity index 79% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/DetectorScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java index 930438566..1ccddcf28 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/DetectorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java @@ -1,13 +1,13 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.DetectorContainer; -import com.raoulvdberge.refinedstorage.render.RenderSettings; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.DetectorModeSideButton; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.TypeSideButton; -import com.raoulvdberge.refinedstorage.tile.DetectorTile; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.DetectorContainer; +import com.refinedmods.refinedstorage.render.RenderSettings; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.DetectorModeSideButton; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.TypeSideButton; +import com.refinedmods.refinedstorage.tile.DetectorTile; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/DiskDriveScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java similarity index 84% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/DiskDriveScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java index df3c1e069..73427e798 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/DiskDriveScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.container.DiskDriveContainer; -import com.raoulvdberge.refinedstorage.tile.DiskDriveTile; +import com.refinedmods.refinedstorage.container.DiskDriveContainer; +import com.refinedmods.refinedstorage.tile.DiskDriveTile; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/DiskManipulatorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/DiskManipulatorScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java index 5aa9ec3b9..bbf863736 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/DiskManipulatorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.DiskManipulatorContainer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.*; -import com.raoulvdberge.refinedstorage.tile.DiskManipulatorTile; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.DiskManipulatorContainer; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.*; +import com.refinedmods.refinedstorage.tile.DiskManipulatorTile; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/EmptyScreenInfoProvider.java b/src/main/java/com/refinedmods/refinedstorage/screen/EmptyScreenInfoProvider.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/EmptyScreenInfoProvider.java rename to src/main/java/com/refinedmods/refinedstorage/screen/EmptyScreenInfoProvider.java index 421427f7a..5b62bd839 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/EmptyScreenInfoProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/EmptyScreenInfoProvider.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; public class EmptyScreenInfoProvider implements IScreenInfoProvider { @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/ExporterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ExporterScreen.java similarity index 75% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/ExporterScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/ExporterScreen.java index 9fdd3d50f..2d38d5bd8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/ExporterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ExporterScreen.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.ExporterContainer; -import com.raoulvdberge.refinedstorage.item.UpgradeItem; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.TypeSideButton; -import com.raoulvdberge.refinedstorage.tile.ExporterTile; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.ExporterContainer; +import com.refinedmods.refinedstorage.item.UpgradeItem; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.TypeSideButton; +import com.refinedmods.refinedstorage.tile.ExporterTile; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/ExternalStorageScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ExternalStorageScreen.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/ExternalStorageScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/ExternalStorageScreen.java index c41cdd1be..0961f75eb 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/ExternalStorageScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ExternalStorageScreen.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.container.ExternalStorageContainer; -import com.raoulvdberge.refinedstorage.tile.ExternalStorageTile; +import com.refinedmods.refinedstorage.container.ExternalStorageContainer; +import com.refinedmods.refinedstorage.tile.ExternalStorageTile; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/FilterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/FilterScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java index 5e8964fde..458c08721 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/FilterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java @@ -1,14 +1,14 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.api.util.IFilter; -import com.raoulvdberge.refinedstorage.container.FilterContainer; -import com.raoulvdberge.refinedstorage.item.FilterItem; -import com.raoulvdberge.refinedstorage.network.FilterUpdateMessage; -import com.raoulvdberge.refinedstorage.render.RenderSettings; -import com.raoulvdberge.refinedstorage.screen.widget.CheckboxWidget; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.FilterTypeSideButton; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.api.util.IFilter; +import com.refinedmods.refinedstorage.container.FilterContainer; +import com.refinedmods.refinedstorage.item.FilterItem; +import com.refinedmods.refinedstorage.network.FilterUpdateMessage; +import com.refinedmods.refinedstorage.render.RenderSettings; +import com.refinedmods.refinedstorage.screen.widget.CheckboxWidget; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.FilterTypeSideButton; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/FluidAmountScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/FluidAmountScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java index cf674ec5e..aaa987ce9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/FluidAmountScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.FluidAmountContainer; -import com.raoulvdberge.refinedstorage.network.SetFluidFilterSlotMessage; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.FluidAmountContainer; +import com.refinedmods.refinedstorage.network.SetFluidFilterSlotMessage; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/FluidInterfaceScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/FluidInterfaceScreen.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/FluidInterfaceScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/FluidInterfaceScreen.java index f4ad1bbcc..ed02449b3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/FluidInterfaceScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/FluidInterfaceScreen.java @@ -1,13 +1,13 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.FluidInterfaceNetworkNode; -import com.raoulvdberge.refinedstorage.container.FluidInterfaceContainer; -import com.raoulvdberge.refinedstorage.render.FluidRenderer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; -import com.raoulvdberge.refinedstorage.tile.FluidInterfaceTile; -import com.raoulvdberge.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.network.node.FluidInterfaceNetworkNode; +import com.refinedmods.refinedstorage.container.FluidInterfaceContainer; +import com.refinedmods.refinedstorage.render.FluidRenderer; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; +import com.refinedmods.refinedstorage.tile.FluidInterfaceTile; +import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/FluidStorageBlockScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/FluidStorageBlockScreen.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/FluidStorageBlockScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/FluidStorageBlockScreen.java index 1d6878ce1..9cb48c64b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/FluidStorageBlockScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/FluidStorageBlockScreen.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.container.FluidStorageContainer; -import com.raoulvdberge.refinedstorage.tile.FluidStorageTile; +import com.refinedmods.refinedstorage.container.FluidStorageContainer; +import com.refinedmods.refinedstorage.tile.FluidStorageTile; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/IScreenInfoProvider.java b/src/main/java/com/refinedmods/refinedstorage/screen/IScreenInfoProvider.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/IScreenInfoProvider.java rename to src/main/java/com/refinedmods/refinedstorage/screen/IScreenInfoProvider.java index 4c36ba9d9..0860bf2fe 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/IScreenInfoProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/IScreenInfoProvider.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; public interface IScreenInfoProvider { int getVisibleRows(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/ImporterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ImporterScreen.java similarity index 68% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/ImporterScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/ImporterScreen.java index 6579c831d..2fbbcead9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/ImporterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ImporterScreen.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.ImporterContainer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.TypeSideButton; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.WhitelistBlacklistSideButton; -import com.raoulvdberge.refinedstorage.tile.ImporterTile; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.ImporterContainer; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.TypeSideButton; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.WhitelistBlacklistSideButton; +import com.refinedmods.refinedstorage.tile.ImporterTile; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/InterfaceScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/InterfaceScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java index 4560f5dc1..3a4a3e328 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/InterfaceScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.InterfaceContainer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; -import com.raoulvdberge.refinedstorage.tile.InterfaceTile; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.InterfaceContainer; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; +import com.refinedmods.refinedstorage.tile.InterfaceTile; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/ItemAmountScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ItemAmountScreen.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/ItemAmountScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/ItemAmountScreen.java index 1c68d1ccf..8cb427fd7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/ItemAmountScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ItemAmountScreen.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.AmountContainer; -import com.raoulvdberge.refinedstorage.network.SetFilterSlotMessage; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.AmountContainer; +import com.refinedmods.refinedstorage.network.SetFilterSlotMessage; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/KeyInputListener.java b/src/main/java/com/refinedmods/refinedstorage/screen/KeyInputListener.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/KeyInputListener.java rename to src/main/java/com/refinedmods/refinedstorage/screen/KeyInputListener.java index 14a4ec410..0c591773f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/KeyInputListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/KeyInputListener.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSItems; -import com.raoulvdberge.refinedstorage.RSKeyBindings; -import com.raoulvdberge.refinedstorage.network.OpenNetworkItemMessage; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSItems; +import com.refinedmods.refinedstorage.RSKeyBindings; +import com.refinedmods.refinedstorage.network.OpenNetworkItemMessage; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/NetworkTransmitterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/NetworkTransmitterScreen.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/NetworkTransmitterScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/NetworkTransmitterScreen.java index 963c2e96c..c72bdb502 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/NetworkTransmitterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/NetworkTransmitterScreen.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.NetworkTransmitterContainer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; -import com.raoulvdberge.refinedstorage.tile.NetworkTransmitterTile; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.NetworkTransmitterContainer; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; +import com.refinedmods.refinedstorage.tile.NetworkTransmitterTile; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/PriorityScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/PriorityScreen.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/PriorityScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/PriorityScreen.java index c46d2db39..cdb5708dc 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/PriorityScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/PriorityScreen.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/RelayScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/RelayScreen.java similarity index 76% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/RelayScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/RelayScreen.java index 2e1f7d013..eab1ebdd7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/RelayScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/RelayScreen.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.RelayContainer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; -import com.raoulvdberge.refinedstorage.tile.RelayTile; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.RelayContainer; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; +import com.refinedmods.refinedstorage.tile.RelayTile; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/SecurityManagerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/SecurityManagerScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java index c3704763b..d70902d7b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/SecurityManagerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java @@ -1,14 +1,14 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.container.SecurityManagerContainer; -import com.raoulvdberge.refinedstorage.item.SecurityCardItem; -import com.raoulvdberge.refinedstorage.network.SecurityManagerUpdateMessage; -import com.raoulvdberge.refinedstorage.screen.widget.CheckboxWidget; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; -import com.raoulvdberge.refinedstorage.tile.SecurityManagerTile; -import com.raoulvdberge.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.container.SecurityManagerContainer; +import com.refinedmods.refinedstorage.item.SecurityCardItem; +import com.refinedmods.refinedstorage.network.SecurityManagerUpdateMessage; +import com.refinedmods.refinedstorage.screen.widget.CheckboxWidget; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; +import com.refinedmods.refinedstorage.tile.SecurityManagerTile; +import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/StorageBlockScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/StorageBlockScreen.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/StorageBlockScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/StorageBlockScreen.java index b9d3c5759..7f534abaa 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/StorageBlockScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/StorageBlockScreen.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.container.StorageContainer; -import com.raoulvdberge.refinedstorage.tile.StorageTile; +import com.refinedmods.refinedstorage.container.StorageContainer; +import com.refinedmods.refinedstorage.tile.StorageTile; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/StorageMonitorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/StorageMonitorScreen.java similarity index 73% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/StorageMonitorScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/StorageMonitorScreen.java index 406ec4fca..6e409d340 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/StorageMonitorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/StorageMonitorScreen.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.StorageMonitorContainer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.TypeSideButton; -import com.raoulvdberge.refinedstorage.tile.StorageMonitorTile; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.StorageMonitorContainer; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.TypeSideButton; +import com.refinedmods.refinedstorage.tile.StorageMonitorTile; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/StorageScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreen.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/StorageScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/StorageScreen.java index 46b7ae47f..d6e16e11c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/StorageScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreen.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.*; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import com.raoulvdberge.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.*; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Container; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/WirelessTransmitterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/WirelessTransmitterScreen.java similarity index 78% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/WirelessTransmitterScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/WirelessTransmitterScreen.java index d0dee8f92..781c38f52 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/WirelessTransmitterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/WirelessTransmitterScreen.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.screen; +package com.refinedmods.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.WirelessTransmitterContainer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; -import com.raoulvdberge.refinedstorage.tile.WirelessTransmitterTile; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.WirelessTransmitterContainer; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; +import com.refinedmods.refinedstorage.tile.WirelessTransmitterTile; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/factory/CrafterManagerScreenFactory.java b/src/main/java/com/refinedmods/refinedstorage/screen/factory/CrafterManagerScreenFactory.java similarity index 75% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/factory/CrafterManagerScreenFactory.java rename to src/main/java/com/refinedmods/refinedstorage/screen/factory/CrafterManagerScreenFactory.java index 39553a668..a81f00c4c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/factory/CrafterManagerScreenFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/factory/CrafterManagerScreenFactory.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.screen.factory; +package com.refinedmods.refinedstorage.screen.factory; -import com.raoulvdberge.refinedstorage.container.CrafterManagerContainer; -import com.raoulvdberge.refinedstorage.screen.CrafterManagerScreen; +import com.refinedmods.refinedstorage.container.CrafterManagerContainer; +import com.refinedmods.refinedstorage.screen.CrafterManagerScreen; import net.minecraft.client.gui.ScreenManager; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/factory/GridScreenFactory.java b/src/main/java/com/refinedmods/refinedstorage/screen/factory/GridScreenFactory.java similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/factory/GridScreenFactory.java rename to src/main/java/com/refinedmods/refinedstorage/screen/factory/GridScreenFactory.java index 690be586c..0e903fe48 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/factory/GridScreenFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/factory/GridScreenFactory.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.screen.factory; +package com.refinedmods.refinedstorage.screen.factory; -import com.raoulvdberge.refinedstorage.container.GridContainer; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; +import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.screen.grid.GridScreen; import net.minecraft.client.gui.ScreenManager; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/AlternativesScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/AlternativesScreen.java similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/AlternativesScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/AlternativesScreen.java index ffcdcb2b2..b7682e7ec 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/AlternativesScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/AlternativesScreen.java @@ -1,16 +1,16 @@ -package com.raoulvdberge.refinedstorage.screen.grid; +package com.refinedmods.refinedstorage.screen.grid; import com.mojang.blaze3d.systems.RenderSystem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.AlternativesContainer; -import com.raoulvdberge.refinedstorage.render.FluidRenderer; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.widget.CheckboxWidget; -import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; -import com.raoulvdberge.refinedstorage.tile.grid.GridTile; -import com.raoulvdberge.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.AlternativesContainer; +import com.refinedmods.refinedstorage.render.FluidRenderer; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.widget.CheckboxWidget; +import com.refinedmods.refinedstorage.screen.widget.ScrollbarWidget; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.tile.grid.GridTile; +import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/CraftingPreviewScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingPreviewScreen.java similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/CraftingPreviewScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingPreviewScreen.java index 418e92777..b23200b02 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/CraftingPreviewScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingPreviewScreen.java @@ -1,21 +1,21 @@ -package com.raoulvdberge.refinedstorage.screen.grid; +package com.refinedmods.refinedstorage.screen.grid; import com.mojang.blaze3d.systems.RenderSystem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskErrorType; -import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.ErrorCraftingPreviewElement; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.FluidCraftingPreviewElement; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.ItemCraftingPreviewElement; -import com.raoulvdberge.refinedstorage.apiimpl.render.CraftingPreviewElementDrawers; -import com.raoulvdberge.refinedstorage.item.PatternItem; -import com.raoulvdberge.refinedstorage.network.grid.GridCraftingStartRequestMessage; -import com.raoulvdberge.refinedstorage.render.RenderSettings; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget; -import com.raoulvdberge.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; +import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; +import com.refinedmods.refinedstorage.api.autocrafting.task.CraftingTaskErrorType; +import com.refinedmods.refinedstorage.api.render.IElementDrawers; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.preview.ErrorCraftingPreviewElement; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.preview.FluidCraftingPreviewElement; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.preview.ItemCraftingPreviewElement; +import com.refinedmods.refinedstorage.apiimpl.render.CraftingPreviewElementDrawers; +import com.refinedmods.refinedstorage.item.PatternItem; +import com.refinedmods.refinedstorage.network.grid.GridCraftingStartRequestMessage; +import com.refinedmods.refinedstorage.render.RenderSettings; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.widget.ScrollbarWidget; +import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.button.Button; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/CraftingSettingsScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java similarity index 78% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/CraftingSettingsScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java index 333e502e7..0019b6606 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/CraftingSettingsScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.screen.grid; +package com.refinedmods.refinedstorage.screen.grid; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.CraftingSettingsContainer; -import com.raoulvdberge.refinedstorage.network.grid.GridCraftingPreviewRequestMessage; -import com.raoulvdberge.refinedstorage.screen.AmountSpecifyingScreen; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.grid.stack.FluidGridStack; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.container.CraftingSettingsContainer; +import com.refinedmods.refinedstorage.network.grid.GridCraftingPreviewRequestMessage; +import com.refinedmods.refinedstorage.screen.AmountSpecifyingScreen; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.grid.stack.FluidGridStack; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.text.TranslationTextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java index 1c76c90ee..db6a23757 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java @@ -1,35 +1,35 @@ -package com.raoulvdberge.refinedstorage.screen.grid; +package com.refinedmods.refinedstorage.screen.grid; import com.google.common.collect.Lists; import com.mojang.blaze3d.systems.RenderSystem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSKeyBindings; -import com.raoulvdberge.refinedstorage.api.network.grid.GridType; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.GridNetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.render.ElementDrawers; -import com.raoulvdberge.refinedstorage.container.GridContainer; -import com.raoulvdberge.refinedstorage.network.grid.*; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.IScreenInfoProvider; -import com.raoulvdberge.refinedstorage.screen.grid.sorting.*; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; -import com.raoulvdberge.refinedstorage.screen.grid.stack.ItemGridStack; -import com.raoulvdberge.refinedstorage.screen.grid.view.FluidGridView; -import com.raoulvdberge.refinedstorage.screen.grid.view.IGridView; -import com.raoulvdberge.refinedstorage.screen.grid.view.ItemGridView; -import com.raoulvdberge.refinedstorage.screen.widget.CheckboxWidget; -import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget; -import com.raoulvdberge.refinedstorage.screen.widget.SearchWidget; -import com.raoulvdberge.refinedstorage.screen.widget.TabListWidget; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.*; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; -import com.raoulvdberge.refinedstorage.tile.grid.GridTile; -import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; -import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGridTile; -import com.raoulvdberge.refinedstorage.util.RenderUtils; -import com.raoulvdberge.refinedstorage.util.TimeUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSKeyBindings; +import com.refinedmods.refinedstorage.api.network.grid.GridType; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.api.network.grid.handler.IItemGridHandler; +import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; +import com.refinedmods.refinedstorage.apiimpl.render.ElementDrawers; +import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.network.grid.*; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.IScreenInfoProvider; +import com.refinedmods.refinedstorage.screen.grid.sorting.*; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.screen.grid.stack.ItemGridStack; +import com.refinedmods.refinedstorage.screen.grid.view.FluidGridView; +import com.refinedmods.refinedstorage.screen.grid.view.IGridView; +import com.refinedmods.refinedstorage.screen.grid.view.ItemGridView; +import com.refinedmods.refinedstorage.screen.widget.CheckboxWidget; +import com.refinedmods.refinedstorage.screen.widget.ScrollbarWidget; +import com.refinedmods.refinedstorage.screen.widget.SearchWidget; +import com.refinedmods.refinedstorage.screen.widget.TabListWidget; +import com.refinedmods.refinedstorage.screen.widget.sidebutton.*; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.tile.grid.GridTile; +import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid; +import com.refinedmods.refinedstorage.tile.grid.portable.PortableGridTile; +import com.refinedmods.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.util.TimeUtils; import net.minecraft.client.audio.SimpleSound; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; @@ -336,7 +336,7 @@ public class GridScreen extends BaseScreen implements IScreenInfo public void render(int mouseX, int mouseY, float partialTicks) { super.render(mouseX, mouseY, partialTicks); - // Drawn in here for bug #1844 (https://github.com/raoulvdberge/refinedstorage/issues/1844) + // Drawn in here for bug #1844 (https://github.com/refinedmods/refinedstorage/issues/1844) // Item tooltips can't be rendered in the foreground layer due to the X offset translation. if (isOverSlotWithStack()) { drawGridTooltip(view.getStacks().get(slotNumber), mouseX, mouseY); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/CraftableGridFilter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/CraftableGridFilter.java similarity index 77% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/CraftableGridFilter.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/CraftableGridFilter.java index 80294079d..d5afac1a1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/CraftableGridFilter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/CraftableGridFilter.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.screen.grid.filtering; +package com.refinedmods.refinedstorage.screen.grid.filtering; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; import java.util.function.Predicate; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/FilterGridFilter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/FilterGridFilter.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/FilterGridFilter.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/FilterGridFilter.java index 2937c06d9..3f39c9754 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/FilterGridFilter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/FilterGridFilter.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.screen.grid.filtering; +package com.refinedmods.refinedstorage.screen.grid.filtering; -import com.raoulvdberge.refinedstorage.api.util.IFilter; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.screen.grid.stack.FluidGridStack; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; -import com.raoulvdberge.refinedstorage.screen.grid.stack.ItemGridStack; +import com.refinedmods.refinedstorage.api.util.IFilter; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.screen.grid.stack.FluidGridStack; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.screen.grid.stack.ItemGridStack; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/GridFilterParser.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/GridFilterParser.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/GridFilterParser.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/GridFilterParser.java index d689ec9ce..d020c7fed 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/GridFilterParser.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/GridFilterParser.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.screen.grid.filtering; +package com.refinedmods.refinedstorage.screen.grid.filtering; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.api.util.IFilter; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.api.util.IFilter; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; import javax.annotation.Nullable; import java.util.LinkedList; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/ModGridFilter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/ModGridFilter.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/ModGridFilter.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/ModGridFilter.java index 46c0699bc..a1d3d531f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/ModGridFilter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/ModGridFilter.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.screen.grid.filtering; +package com.refinedmods.refinedstorage.screen.grid.filtering; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; import java.util.function.Predicate; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/NameGridFilter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/NameGridFilter.java similarity index 72% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/NameGridFilter.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/NameGridFilter.java index 3d4cb3b4c..77f9f4c76 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/NameGridFilter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/NameGridFilter.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.screen.grid.filtering; +package com.refinedmods.refinedstorage.screen.grid.filtering; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; import java.util.function.Predicate; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/OrGridFilter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/OrGridFilter.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/OrGridFilter.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/OrGridFilter.java index 81359f8b5..f22e45828 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/OrGridFilter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/OrGridFilter.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.screen.grid.filtering; +package com.refinedmods.refinedstorage.screen.grid.filtering; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; import java.util.List; import java.util.function.Predicate; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/TagGridFilter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/TagGridFilter.java similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/TagGridFilter.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/TagGridFilter.java index 18cc2d59e..a86056a5d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/TagGridFilter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/TagGridFilter.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.screen.grid.filtering; +package com.refinedmods.refinedstorage.screen.grid.filtering; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; import java.util.function.Predicate; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/TooltipGridFilter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/TooltipGridFilter.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/TooltipGridFilter.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/TooltipGridFilter.java index fc40acde4..588c1c6e6 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/TooltipGridFilter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/TooltipGridFilter.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.screen.grid.filtering; +package com.refinedmods.refinedstorage.screen.grid.filtering; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; import java.util.function.Predicate; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/IGridSorter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/IGridSorter.java new file mode 100644 index 000000000..0053457ce --- /dev/null +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/IGridSorter.java @@ -0,0 +1,10 @@ +package com.refinedmods.refinedstorage.screen.grid.sorting; + +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; + +public interface IGridSorter { + boolean isApplicable(IGrid grid); + + int compare(IGridStack left, IGridStack right, SortingDirection direction); +} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/IdGridSorter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/IdGridSorter.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/IdGridSorter.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/IdGridSorter.java index 1f59d1971..938a90815 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/IdGridSorter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/IdGridSorter.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.screen.grid.sorting; +package com.refinedmods.refinedstorage.screen.grid.sorting; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.registry.Registry; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/InventoryTweaksGridSorter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/InventoryTweaksGridSorter.java similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/InventoryTweaksGridSorter.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/InventoryTweaksGridSorter.java index d652ce30d..99d03d828 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/InventoryTweaksGridSorter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/InventoryTweaksGridSorter.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.screen.grid.sorting; +package com.refinedmods.refinedstorage.screen.grid.sorting; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; public class InventoryTweaksGridSorter implements IGridSorter { @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/LastModifiedGridSorter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/LastModifiedGridSorter.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/LastModifiedGridSorter.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/LastModifiedGridSorter.java index e56c5f7e6..19d3baa5b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/LastModifiedGridSorter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/LastModifiedGridSorter.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.screen.grid.sorting; +package com.refinedmods.refinedstorage.screen.grid.sorting; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; public class LastModifiedGridSorter implements IGridSorter { @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/NameGridSorter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/NameGridSorter.java similarity index 77% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/NameGridSorter.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/NameGridSorter.java index 8f5531728..0a41335a3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/NameGridSorter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/NameGridSorter.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.screen.grid.sorting; +package com.refinedmods.refinedstorage.screen.grid.sorting; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; public class NameGridSorter implements IGridSorter { @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/QuantityGridSorter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/QuantityGridSorter.java similarity index 79% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/QuantityGridSorter.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/QuantityGridSorter.java index 0ced1b244..24ac0a9ee 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/QuantityGridSorter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/QuantityGridSorter.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.screen.grid.sorting; +package com.refinedmods.refinedstorage.screen.grid.sorting; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; public class QuantityGridSorter implements IGridSorter { @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/SortingDirection.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/SortingDirection.java similarity index 51% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/SortingDirection.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/SortingDirection.java index fc7c5b0d2..979e3ee55 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/SortingDirection.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/SortingDirection.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.screen.grid.sorting; +package com.refinedmods.refinedstorage.screen.grid.sorting; public enum SortingDirection { ASCENDING, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/FluidGridStack.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/FluidGridStack.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/FluidGridStack.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/FluidGridStack.java index 6c2192bc0..8195d5a5d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/FluidGridStack.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/FluidGridStack.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.screen.grid.stack; +package com.refinedmods.refinedstorage.screen.grid.stack; -import com.raoulvdberge.refinedstorage.api.storage.tracker.StorageTrackerEntry; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.render.FluidRenderer; -import com.raoulvdberge.refinedstorage.render.RenderSettings; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.api.storage.tracker.StorageTrackerEntry; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.render.FluidRenderer; +import com.refinedmods.refinedstorage.render.RenderSettings; +import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.client.resources.I18n; import net.minecraft.tags.FluidTags; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/IGridStack.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/IGridStack.java similarity index 76% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/IGridStack.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/IGridStack.java index 1d76dd549..b79351b6c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/IGridStack.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/IGridStack.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.screen.grid.stack; +package com.refinedmods.refinedstorage.screen.grid.stack; -import com.raoulvdberge.refinedstorage.api.storage.tracker.StorageTrackerEntry; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.api.storage.tracker.StorageTrackerEntry; +import com.refinedmods.refinedstorage.screen.BaseScreen; import javax.annotation.Nullable; import java.util.Set; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/ItemGridStack.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/ItemGridStack.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/ItemGridStack.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/ItemGridStack.java index 91b2ff3c8..825ce8ce4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/ItemGridStack.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/ItemGridStack.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.screen.grid.stack; +package com.refinedmods.refinedstorage.screen.grid.stack; -import com.raoulvdberge.refinedstorage.api.storage.tracker.StorageTrackerEntry; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.render.RenderSettings; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.api.storage.tracker.StorageTrackerEntry; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.render.RenderSettings; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.tags.ItemTags; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/view/BaseGridView.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/BaseGridView.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/view/BaseGridView.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/view/BaseGridView.java index 2829082a3..d4bb196fb 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/view/BaseGridView.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/BaseGridView.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.screen.grid.view; +package com.refinedmods.refinedstorage.screen.grid.view; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; -import com.raoulvdberge.refinedstorage.screen.grid.filtering.GridFilterParser; -import com.raoulvdberge.refinedstorage.screen.grid.sorting.IGridSorter; -import com.raoulvdberge.refinedstorage.screen.grid.sorting.SortingDirection; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.screen.grid.GridScreen; +import com.refinedmods.refinedstorage.screen.grid.filtering.GridFilterParser; +import com.refinedmods.refinedstorage.screen.grid.sorting.IGridSorter; +import com.refinedmods.refinedstorage.screen.grid.sorting.SortingDirection; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; import javax.annotation.Nullable; import java.util.*; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/view/FluidGridView.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/FluidGridView.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/view/FluidGridView.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/view/FluidGridView.java index 5ab815f54..17aa6538c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/view/FluidGridView.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/FluidGridView.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.screen.grid.view; +package com.refinedmods.refinedstorage.screen.grid.view; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; -import com.raoulvdberge.refinedstorage.screen.grid.sorting.IGridSorter; -import com.raoulvdberge.refinedstorage.screen.grid.stack.FluidGridStack; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.screen.grid.GridScreen; +import com.refinedmods.refinedstorage.screen.grid.sorting.IGridSorter; +import com.refinedmods.refinedstorage.screen.grid.stack.FluidGridStack; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; import java.util.List; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/view/IGridView.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/IGridView.java similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/view/IGridView.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/view/IGridView.java index 1fe8e7b84..6814b4c0c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/view/IGridView.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/IGridView.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.screen.grid.view; +package com.refinedmods.refinedstorage.screen.grid.view; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; import javax.annotation.Nullable; import java.util.List; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/view/ItemGridView.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/ItemGridView.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/view/ItemGridView.java rename to src/main/java/com/refinedmods/refinedstorage/screen/grid/view/ItemGridView.java index 2221db99f..3764a8761 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/view/ItemGridView.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/ItemGridView.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.screen.grid.view; +package com.refinedmods.refinedstorage.screen.grid.view; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; -import com.raoulvdberge.refinedstorage.screen.grid.sorting.IGridSorter; -import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; -import com.raoulvdberge.refinedstorage.screen.grid.stack.ItemGridStack; +import com.refinedmods.refinedstorage.screen.grid.GridScreen; +import com.refinedmods.refinedstorage.screen.grid.sorting.IGridSorter; +import com.refinedmods.refinedstorage.screen.grid.stack.IGridStack; +import com.refinedmods.refinedstorage.screen.grid.stack.ItemGridStack; import java.util.List; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/CheckboxWidget.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/CheckboxWidget.java similarity index 97% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/CheckboxWidget.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/CheckboxWidget.java index cb6831ded..15c793313 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/CheckboxWidget.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/CheckboxWidget.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.screen.widget; +package com.refinedmods.refinedstorage.screen.widget; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidget.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidget.java similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidget.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidget.java index c436b1a82..92856eb16 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidget.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidget.java @@ -1,12 +1,11 @@ -package com.raoulvdberge.refinedstorage.screen.widget; +package com.refinedmods.refinedstorage.screen.widget; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.integration.jei.GridRecipeTransferHandler; -import com.raoulvdberge.refinedstorage.integration.jei.JeiIntegration; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.integration.jei.GridRecipeTransferHandler; +import com.refinedmods.refinedstorage.integration.jei.JeiIntegration; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.gui.IGuiEventListener; import java.util.LinkedList; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidgetListener.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidgetListener.java similarity index 64% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidgetListener.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidgetListener.java index 354a49201..92898c642 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidgetListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidgetListener.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.screen.widget; +package com.refinedmods.refinedstorage.screen.widget; public interface ScrollbarWidgetListener { void onOffsetChanged(int oldOffset, int newOffset); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/SearchWidget.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/SearchWidget.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/SearchWidget.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/SearchWidget.java index 7741a424a..13c1c2946 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/SearchWidget.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/SearchWidget.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.screen.widget; +package com.refinedmods.refinedstorage.screen.widget; -import com.raoulvdberge.refinedstorage.RSKeyBindings; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.integration.jei.JeiIntegration; -import com.raoulvdberge.refinedstorage.integration.jei.RSJeiPlugin; -import com.raoulvdberge.refinedstorage.render.RenderSettings; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.RSKeyBindings; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.integration.jei.JeiIntegration; +import com.refinedmods.refinedstorage.integration.jei.RSJeiPlugin; +import com.refinedmods.refinedstorage.render.RenderSettings; +import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.widget.TextFieldWidget; import org.lwjgl.glfw.GLFW; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/TabListWidget.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/TabListWidget.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/TabListWidget.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/TabListWidget.java index 6dd2fb37b..a0264f2eb 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/TabListWidget.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/TabListWidget.java @@ -1,12 +1,11 @@ -package com.raoulvdberge.refinedstorage.screen.widget; +package com.refinedmods.refinedstorage.screen.widget; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.grid.IGridTab; -import com.raoulvdberge.refinedstorage.apiimpl.render.ElementDrawers; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.grid.IGridTab; +import com.refinedmods.refinedstorage.apiimpl.render.ElementDrawers; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.widget.button.Button; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java similarity index 70% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java index c2fa843a8..8089f0504 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.screen.widget.sidebutton; +package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import com.raoulvdberge.refinedstorage.util.AccessTypeUtils; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.util.AccessTypeUtils; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java similarity index 75% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java index 1eedc7ccb..10649f378 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.screen.widget.sidebutton; +package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.tile.ConstructorTile; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.tile.ConstructorTile; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/CrafterManagerSearchBoxModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterManagerSearchBoxModeSideButton.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/CrafterManagerSearchBoxModeSideButton.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterManagerSearchBoxModeSideButton.java index 9a0610a41..0c2e5aad0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/CrafterManagerSearchBoxModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterManagerSearchBoxModeSideButton.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.screen.widget.sidebutton; +package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.integration.jei.JeiIntegration; -import com.raoulvdberge.refinedstorage.screen.CrafterManagerScreen; -import com.raoulvdberge.refinedstorage.tile.CrafterManagerTile; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.integration.jei.JeiIntegration; +import com.refinedmods.refinedstorage.screen.CrafterManagerScreen; +import com.refinedmods.refinedstorage.tile.CrafterManagerTile; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java similarity index 75% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java index ff1874c08..182304dc3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.screen.widget.sidebutton; +package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.tile.CrafterTile; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.tile.CrafterTile; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java similarity index 75% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java index 2bea0af8f..d1aebd9bf 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.screen.widget.sidebutton; +package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.tile.DestructorTile; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.tile.DestructorTile; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java similarity index 77% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java index 613566227..2b4ee4597 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.screen.widget.sidebutton; +package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.DetectorNetworkNode; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.tile.DetectorTile; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.apiimpl.network.node.DetectorNetworkNode; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.tile.DetectorTile; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java similarity index 78% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java index 9d4a99ce2..f067c4a70 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.screen.widget.sidebutton; +package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java index 4d87eff14..dada9fde9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.screen.widget.sidebutton; +package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.raoulvdberge.refinedstorage.screen.FilterScreen; -import com.raoulvdberge.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.screen.FilterScreen; +import com.refinedmods.refinedstorage.tile.config.IType; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSearchBoxModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSearchBoxModeSideButton.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSearchBoxModeSideButton.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSearchBoxModeSideButton.java index bfb267f92..44b8d39b2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSearchBoxModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSearchBoxModeSideButton.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.screen.widget.sidebutton; +package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.integration.jei.JeiIntegration; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.integration.jei.JeiIntegration; +import com.refinedmods.refinedstorage.screen.grid.GridScreen; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java index 63c2d5526..49bcba062 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.screen.widget.sidebutton; +package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java index eac802f31..85bbc9b30 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.screen.widget.sidebutton; +package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java index 12554302b..933ce1665 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.screen.widget.sidebutton; +package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.raoulvdberge.refinedstorage.api.network.grid.GridType; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.GridNetworkNode; -import com.raoulvdberge.refinedstorage.integration.inventorytweaks.InventoryTweaksIntegration; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.api.network.grid.GridType; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; +import com.refinedmods.refinedstorage.integration.inventorytweaks.InventoryTweaksIntegration; +import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java index a2f378a4f..12c1dbf84 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.screen.widget.sidebutton; +package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java index 9c528cfb0..982717d5d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.screen.widget.sidebutton; +package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.diskmanipulator.DiskManipulatorNetworkNode; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.tile.DiskManipulatorTile; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.apiimpl.network.node.diskmanipulator.DiskManipulatorNetworkNode; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.tile.DiskManipulatorTile; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java similarity index 77% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java index bfc6f7014..ad45abf2c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.screen.widget.sidebutton; +package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButton.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java index 6b1d7aa63..1c2c9c79e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java @@ -1,10 +1,9 @@ -package com.raoulvdberge.refinedstorage.screen.widget.sidebutton; +package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.util.RenderUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.gui.widget.button.Button; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/TypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/TypeSideButton.java similarity index 72% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/TypeSideButton.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/TypeSideButton.java index f6a2b97d2..1cb1a05ad 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/TypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/TypeSideButton.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.screen.widget.sidebutton; +package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java similarity index 76% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java rename to src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java index c70562715..9c74dbdb8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.screen.widget.sidebutton; +package com.refinedmods.refinedstorage.screen.widget.sidebutton; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.tile.config.IWhitelistBlacklist; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/setup/ClientSetup.java b/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/setup/ClientSetup.java rename to src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java index 31e131125..1ee4532b9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/setup/ClientSetup.java +++ b/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java @@ -1,18 +1,18 @@ -package com.raoulvdberge.refinedstorage.setup; +package com.refinedmods.refinedstorage.setup; -import com.raoulvdberge.refinedstorage.*; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.container.CrafterContainer; -import com.raoulvdberge.refinedstorage.container.CrafterManagerContainer; -import com.raoulvdberge.refinedstorage.container.slot.CrafterManagerSlot; -import com.raoulvdberge.refinedstorage.render.BakedModelOverrideRegistry; -import com.raoulvdberge.refinedstorage.render.color.PatternItemColor; -import com.raoulvdberge.refinedstorage.render.model.*; -import com.raoulvdberge.refinedstorage.render.resourcepack.ResourcePackListener; -import com.raoulvdberge.refinedstorage.render.tesr.StorageMonitorTileRenderer; -import com.raoulvdberge.refinedstorage.screen.*; -import com.raoulvdberge.refinedstorage.screen.factory.CrafterManagerScreenFactory; -import com.raoulvdberge.refinedstorage.screen.factory.GridScreenFactory; +import com.refinedmods.refinedstorage.*; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.container.CrafterContainer; +import com.refinedmods.refinedstorage.container.CrafterManagerContainer; +import com.refinedmods.refinedstorage.container.slot.CrafterManagerSlot; +import com.refinedmods.refinedstorage.render.BakedModelOverrideRegistry; +import com.refinedmods.refinedstorage.render.color.PatternItemColor; +import com.refinedmods.refinedstorage.render.model.*; +import com.refinedmods.refinedstorage.render.resourcepack.ResourcePackListener; +import com.refinedmods.refinedstorage.render.tesr.StorageMonitorTileRenderer; +import com.refinedmods.refinedstorage.screen.*; +import com.refinedmods.refinedstorage.screen.factory.CrafterManagerScreenFactory; +import com.refinedmods.refinedstorage.screen.factory.GridScreenFactory; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScreenManager; import net.minecraft.client.gui.screen.Screen; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/setup/CommonSetup.java b/src/main/java/com/refinedmods/refinedstorage/setup/CommonSetup.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/setup/CommonSetup.java rename to src/main/java/com/refinedmods/refinedstorage/setup/CommonSetup.java index fdb727a1c..4e5d4b954 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/setup/CommonSetup.java +++ b/src/main/java/com/refinedmods/refinedstorage/setup/CommonSetup.java @@ -1,52 +1,52 @@ -package com.raoulvdberge.refinedstorage.setup; +package com.refinedmods.refinedstorage.setup; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSBlocks; -import com.raoulvdberge.refinedstorage.api.network.NetworkType; -import com.raoulvdberge.refinedstorage.api.network.grid.GridType; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.storage.StorageType; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.ErrorCraftingMonitorElement; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.FluidCraftingMonitorElement; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.ItemCraftingMonitorElement; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.ErrorCraftingPreviewElement; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.FluidCraftingPreviewElement; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.ItemCraftingPreviewElement; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5.CraftingTaskFactory; -import com.raoulvdberge.refinedstorage.apiimpl.network.NetworkListener; -import com.raoulvdberge.refinedstorage.apiimpl.network.NetworkNodeListener; -import com.raoulvdberge.refinedstorage.apiimpl.network.grid.factory.*; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.*; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.diskdrive.DiskDriveNetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.diskmanipulator.DiskManipulatorNetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.FluidStorageNetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.storage.FluidStorageType; -import com.raoulvdberge.refinedstorage.apiimpl.storage.ItemStorageType; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.factory.FluidStorageDiskFactory; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.factory.ItemStorageDiskFactory; -import com.raoulvdberge.refinedstorage.apiimpl.storage.externalstorage.FluidExternalStorageProvider; -import com.raoulvdberge.refinedstorage.apiimpl.storage.externalstorage.ItemExternalStorageProvider; -import com.raoulvdberge.refinedstorage.block.*; -import com.raoulvdberge.refinedstorage.capability.NetworkNodeProxyCapability; -import com.raoulvdberge.refinedstorage.container.*; -import com.raoulvdberge.refinedstorage.container.factory.*; -import com.raoulvdberge.refinedstorage.integration.craftingtweaks.CraftingTweaksIntegration; -import com.raoulvdberge.refinedstorage.integration.inventorysorter.InventorySorterIntegration; -import com.raoulvdberge.refinedstorage.item.*; -import com.raoulvdberge.refinedstorage.item.blockitem.*; -import com.raoulvdberge.refinedstorage.loottable.ControllerLootFunctionSerializer; -import com.raoulvdberge.refinedstorage.loottable.CrafterLootFunctionSerializer; -import com.raoulvdberge.refinedstorage.loottable.PortableGridBlockLootFunctionSerializer; -import com.raoulvdberge.refinedstorage.loottable.StorageBlockLootFunctionSerializer; -import com.raoulvdberge.refinedstorage.recipe.UpgradeWithEnchantedBookRecipeSerializer; -import com.raoulvdberge.refinedstorage.tile.*; -import com.raoulvdberge.refinedstorage.tile.craftingmonitor.CraftingMonitorTile; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; -import com.raoulvdberge.refinedstorage.tile.grid.GridTile; -import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGridTile; -import com.raoulvdberge.refinedstorage.util.BlockUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSBlocks; +import com.refinedmods.refinedstorage.api.network.NetworkType; +import com.refinedmods.refinedstorage.api.network.grid.GridType; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.storage.StorageType; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor.ErrorCraftingMonitorElement; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor.FluidCraftingMonitorElement; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor.ItemCraftingMonitorElement; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.preview.ErrorCraftingPreviewElement; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.preview.FluidCraftingPreviewElement; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.preview.ItemCraftingPreviewElement; +import com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v5.CraftingTaskFactory; +import com.refinedmods.refinedstorage.apiimpl.network.NetworkListener; +import com.refinedmods.refinedstorage.apiimpl.network.NetworkNodeListener; +import com.refinedmods.refinedstorage.apiimpl.network.grid.factory.*; +import com.refinedmods.refinedstorage.apiimpl.network.node.*; +import com.refinedmods.refinedstorage.apiimpl.network.node.diskdrive.DiskDriveNetworkNode; +import com.refinedmods.refinedstorage.apiimpl.network.node.diskmanipulator.DiskManipulatorNetworkNode; +import com.refinedmods.refinedstorage.apiimpl.network.node.storage.FluidStorageNetworkNode; +import com.refinedmods.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode; +import com.refinedmods.refinedstorage.apiimpl.storage.FluidStorageType; +import com.refinedmods.refinedstorage.apiimpl.storage.ItemStorageType; +import com.refinedmods.refinedstorage.apiimpl.storage.disk.factory.FluidStorageDiskFactory; +import com.refinedmods.refinedstorage.apiimpl.storage.disk.factory.ItemStorageDiskFactory; +import com.refinedmods.refinedstorage.apiimpl.storage.externalstorage.FluidExternalStorageProvider; +import com.refinedmods.refinedstorage.apiimpl.storage.externalstorage.ItemExternalStorageProvider; +import com.refinedmods.refinedstorage.block.*; +import com.refinedmods.refinedstorage.capability.NetworkNodeProxyCapability; +import com.refinedmods.refinedstorage.container.*; +import com.refinedmods.refinedstorage.container.factory.*; +import com.refinedmods.refinedstorage.integration.craftingtweaks.CraftingTweaksIntegration; +import com.refinedmods.refinedstorage.integration.inventorysorter.InventorySorterIntegration; +import com.refinedmods.refinedstorage.item.*; +import com.refinedmods.refinedstorage.item.blockitem.*; +import com.refinedmods.refinedstorage.loottable.ControllerLootFunctionSerializer; +import com.refinedmods.refinedstorage.loottable.CrafterLootFunctionSerializer; +import com.refinedmods.refinedstorage.loottable.PortableGridBlockLootFunctionSerializer; +import com.refinedmods.refinedstorage.loottable.StorageBlockLootFunctionSerializer; +import com.refinedmods.refinedstorage.recipe.UpgradeWithEnchantedBookRecipeSerializer; +import com.refinedmods.refinedstorage.tile.*; +import com.refinedmods.refinedstorage.tile.craftingmonitor.CraftingMonitorTile; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.tile.grid.GridTile; +import com.refinedmods.refinedstorage.tile.grid.portable.PortableGridTile; +import com.refinedmods.refinedstorage.util.BlockUtils; import net.minecraft.block.Block; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.Item; @@ -130,8 +130,8 @@ public class CommonSetup { API.instance().getCraftingMonitorElementRegistry().add(FluidCraftingMonitorElement.ID, FluidCraftingMonitorElement::read); API.instance().getCraftingMonitorElementRegistry().add(ErrorCraftingMonitorElement.ID, ErrorCraftingMonitorElement::read); - API.instance().getCraftingTaskRegistry().add( com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5.CraftingTaskFactory.ID, new com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5.CraftingTaskFactory()); - API.instance().getCraftingTaskRegistry().add( com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6.CraftingTaskFactory.ID, new com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6.CraftingTaskFactory()); + API.instance().getCraftingTaskRegistry().add(CraftingTaskFactory.ID, new CraftingTaskFactory()); + API.instance().getCraftingTaskRegistry().add(com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v6.CraftingTaskFactory.ID, new com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v6.CraftingTaskFactory()); LootFunctionManager.registerFunction(new StorageBlockLootFunctionSerializer()); LootFunctionManager.registerFunction(new PortableGridBlockLootFunctionSerializer()); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/setup/ServerSetup.java b/src/main/java/com/refinedmods/refinedstorage/setup/ServerSetup.java similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/setup/ServerSetup.java rename to src/main/java/com/refinedmods/refinedstorage/setup/ServerSetup.java index bdb965aea..4ddd7da10 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/setup/ServerSetup.java +++ b/src/main/java/com/refinedmods/refinedstorage/setup/ServerSetup.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.setup; +package com.refinedmods.refinedstorage.setup; -import com.raoulvdberge.refinedstorage.command.PatternDumpCommand; +import com.refinedmods.refinedstorage.command.PatternDumpCommand; import net.minecraft.command.Commands; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.event.server.FMLServerStartingEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/BaseTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/BaseTile.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/BaseTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/BaseTile.java index 1e18681bd..5b760d210 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/BaseTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/BaseTile.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SUpdateTileEntityPacket; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/CableTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/CableTile.java similarity index 69% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/CableTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/CableTile.java index 3df889540..a3910ae86 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/CableTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/CableTile.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.CableNetworkNode; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.apiimpl.network.node.CableNetworkNode; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/ClientNode.java b/src/main/java/com/refinedmods/refinedstorage/tile/ClientNode.java old mode 100755 new mode 100644 similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/ClientNode.java rename to src/main/java/com/refinedmods/refinedstorage/tile/ClientNode.java index c97e27e24..6f171b0ea --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/ClientNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/ClientNode.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.API; import net.minecraft.item.ItemStack; public class ClientNode { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/ConstructorTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/ConstructorTile.java similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/ConstructorTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/ConstructorTile.java index 4fa317aae..fa4b0c3fe 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/ConstructorTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/ConstructorTile.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.ConstructorNetworkNode; -import com.raoulvdberge.refinedstorage.tile.config.IComparable; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.apiimpl.network.node.ConstructorNetworkNode; +import com.refinedmods.refinedstorage.tile.config.IComparable; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/ControllerTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/ControllerTile.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/ControllerTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/ControllerTile.java index b7359514e..e9bc7c304 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/ControllerTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/ControllerTile.java @@ -1,20 +1,20 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.INetworkManager; -import com.raoulvdberge.refinedstorage.api.network.NetworkType; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.network.Network; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.RootNetworkNode; -import com.raoulvdberge.refinedstorage.block.ControllerBlock; -import com.raoulvdberge.refinedstorage.capability.NetworkNodeProxyCapability; -import com.raoulvdberge.refinedstorage.tile.config.IRedstoneConfigurable; -import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode; -import com.raoulvdberge.refinedstorage.tile.data.RSSerializers; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.INetworkManager; +import com.refinedmods.refinedstorage.api.network.NetworkType; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.network.node.INetworkNodeProxy; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.network.Network; +import com.refinedmods.refinedstorage.apiimpl.network.node.RootNetworkNode; +import com.refinedmods.refinedstorage.block.ControllerBlock; +import com.refinedmods.refinedstorage.capability.NetworkNodeProxyCapability; +import com.refinedmods.refinedstorage.tile.config.IRedstoneConfigurable; +import com.refinedmods.refinedstorage.tile.config.RedstoneMode; +import com.refinedmods.refinedstorage.tile.data.RSSerializers; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.datasync.DataSerializers; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/CrafterManagerTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/CrafterManagerTile.java similarity index 76% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/CrafterManagerTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/CrafterManagerTile.java index a2bf11f02..fc8e9a694 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/CrafterManagerTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/CrafterManagerTile.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.CrafterManagerNetworkNode; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.CrafterManagerScreen; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.apiimpl.network.node.CrafterManagerNetworkNode; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.CrafterManagerScreen; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/CrafterTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/CrafterTile.java similarity index 84% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/CrafterTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/CrafterTile.java index 6999a2622..5d6d9c176 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/CrafterTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/CrafterTile.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.CrafterNetworkNode; -import com.raoulvdberge.refinedstorage.screen.CrafterTileDataParameterClientListener; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.apiimpl.network.node.CrafterNetworkNode; +import com.refinedmods.refinedstorage.screen.CrafterTileDataParameterClientListener; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/DestructorTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/DestructorTile.java similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/DestructorTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/DestructorTile.java index 2ece6af88..464bfdc8c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/DestructorTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/DestructorTile.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.DestructorNetworkNode; -import com.raoulvdberge.refinedstorage.tile.config.IComparable; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.tile.config.IWhitelistBlacklist; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.apiimpl.network.node.DestructorNetworkNode; +import com.refinedmods.refinedstorage.tile.config.IComparable; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/DetectorTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/DetectorTile.java similarity index 84% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/DetectorTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/DetectorTile.java index e7b7e95ee..fbff4014b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/DetectorTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/DetectorTile.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.DetectorNetworkNode; -import com.raoulvdberge.refinedstorage.tile.config.IComparable; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.apiimpl.network.node.DetectorNetworkNode; +import com.refinedmods.refinedstorage.tile.config.IComparable; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/DiskDriveTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/DiskDriveTile.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/DiskDriveTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/DiskDriveTile.java index d5885125b..7151d2d9b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/DiskDriveTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/DiskDriveTile.java @@ -1,14 +1,14 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.DiskState; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.diskdrive.DiskDriveNetworkNode; -import com.raoulvdberge.refinedstorage.tile.config.*; -import com.raoulvdberge.refinedstorage.tile.data.RSSerializers; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState; +import com.refinedmods.refinedstorage.apiimpl.network.node.diskdrive.DiskDriveNetworkNode; +import com.refinedmods.refinedstorage.tile.config.*; +import com.refinedmods.refinedstorage.tile.data.RSSerializers; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.IntNBT; import net.minecraft.nbt.ListNBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/DiskManipulatorTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/DiskManipulatorTile.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/DiskManipulatorTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/DiskManipulatorTile.java index 1ee2d4363..efbc8a51a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/DiskManipulatorTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/DiskManipulatorTile.java @@ -1,13 +1,13 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.DiskState; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.diskmanipulator.DiskManipulatorNetworkNode; -import com.raoulvdberge.refinedstorage.tile.config.IComparable; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.tile.config.IWhitelistBlacklist; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState; +import com.refinedmods.refinedstorage.apiimpl.network.node.diskmanipulator.DiskManipulatorNetworkNode; +import com.refinedmods.refinedstorage.tile.config.IComparable; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.IntNBT; import net.minecraft.nbt.ListNBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/ExporterTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/ExporterTile.java similarity index 66% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/ExporterTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/ExporterTile.java index ebd88adb9..4f589e8b5 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/ExporterTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/ExporterTile.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.ExporterNetworkNode; -import com.raoulvdberge.refinedstorage.tile.config.IComparable; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.apiimpl.network.node.ExporterNetworkNode; +import com.refinedmods.refinedstorage.tile.config.IComparable; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/ExternalStorageTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/ExternalStorageTile.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/ExternalStorageTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/ExternalStorageTile.java index 7f02ee9f9..74ef150b0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/ExternalStorageTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/ExternalStorageTile.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStorage; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.ExternalStorageNetworkNode; -import com.raoulvdberge.refinedstorage.tile.config.*; -import com.raoulvdberge.refinedstorage.tile.data.RSSerializers; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorage; +import com.refinedmods.refinedstorage.apiimpl.network.node.ExternalStorageNetworkNode; +import com.refinedmods.refinedstorage.tile.config.*; +import com.refinedmods.refinedstorage.tile.data.RSSerializers; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/FluidInterfaceTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/FluidInterfaceTile.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/FluidInterfaceTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/FluidInterfaceTile.java index e8f86b157..ddc46a8e3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/FluidInterfaceTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/FluidInterfaceTile.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.FluidInterfaceNetworkNode; -import com.raoulvdberge.refinedstorage.tile.data.RSSerializers; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.apiimpl.network.node.FluidInterfaceNetworkNode; +import com.refinedmods.refinedstorage.tile.data.RSSerializers; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/FluidStorageTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/FluidStorageTile.java similarity index 68% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/FluidStorageTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/FluidStorageTile.java index ff62b9d09..1d2ef4160 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/FluidStorageTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/FluidStorageTile.java @@ -1,15 +1,15 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.FluidStorageNetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.storage.FluidStorageType; -import com.raoulvdberge.refinedstorage.tile.config.IAccessType; -import com.raoulvdberge.refinedstorage.tile.config.IComparable; -import com.raoulvdberge.refinedstorage.tile.config.IPrioritizable; -import com.raoulvdberge.refinedstorage.tile.config.IWhitelistBlacklist; -import com.raoulvdberge.refinedstorage.tile.data.RSSerializers; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import com.raoulvdberge.refinedstorage.util.FluidStorageBlockUtils; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.apiimpl.network.node.storage.FluidStorageNetworkNode; +import com.refinedmods.refinedstorage.apiimpl.storage.FluidStorageType; +import com.refinedmods.refinedstorage.tile.config.IAccessType; +import com.refinedmods.refinedstorage.tile.config.IComparable; +import com.refinedmods.refinedstorage.tile.config.IPrioritizable; +import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; +import com.refinedmods.refinedstorage.tile.data.RSSerializers; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.util.FluidStorageBlockUtils; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/ImporterTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/ImporterTile.java similarity index 67% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/ImporterTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/ImporterTile.java index 98c4ee417..5e59c5575 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/ImporterTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/ImporterTile.java @@ -1,11 +1,11 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.ImporterNetworkNode; -import com.raoulvdberge.refinedstorage.tile.config.IComparable; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.tile.config.IWhitelistBlacklist; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.apiimpl.network.node.ImporterNetworkNode; +import com.refinedmods.refinedstorage.tile.config.IComparable; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/InterfaceTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/InterfaceTile.java similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/InterfaceTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/InterfaceTile.java index b9cd1b49e..586ca209b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/InterfaceTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/InterfaceTile.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.InterfaceNetworkNode; -import com.raoulvdberge.refinedstorage.tile.config.IComparable; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.apiimpl.network.node.InterfaceNetworkNode; +import com.refinedmods.refinedstorage.tile.config.IComparable; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/NetworkNodeTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/NetworkNodeTile.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/NetworkNodeTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/NetworkNodeTile.java index b1a68624f..96f3f3379 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/NetworkNodeTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/NetworkNodeTile.java @@ -1,15 +1,15 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeManager; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode; -import com.raoulvdberge.refinedstorage.capability.NetworkNodeProxyCapability; -import com.raoulvdberge.refinedstorage.tile.config.IRedstoneConfigurable; -import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.network.node.INetworkNodeManager; +import com.refinedmods.refinedstorage.api.network.node.INetworkNodeProxy; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.network.node.NetworkNode; +import com.refinedmods.refinedstorage.capability.NetworkNodeProxyCapability; +import com.refinedmods.refinedstorage.tile.config.IRedstoneConfigurable; +import com.refinedmods.refinedstorage.tile.config.RedstoneMode; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/NetworkReceiverTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/NetworkReceiverTile.java similarity index 71% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/NetworkReceiverTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/NetworkReceiverTile.java index 27d327a75..52cd240e0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/NetworkReceiverTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/NetworkReceiverTile.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkReceiverNetworkNode; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.apiimpl.network.node.NetworkReceiverNetworkNode; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/NetworkTransmitterTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/NetworkTransmitterTile.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/NetworkTransmitterTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/NetworkTransmitterTile.java index cac4f76bb..668084783 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/NetworkTransmitterTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/NetworkTransmitterTile.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkTransmitterNetworkNode; -import com.raoulvdberge.refinedstorage.tile.data.RSSerializers; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.apiimpl.network.node.NetworkTransmitterNetworkNode; +import com.refinedmods.refinedstorage.tile.data.RSSerializers; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/RelayTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/RelayTile.java similarity index 69% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/RelayTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/RelayTile.java index c00d17881..2619ba8a7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/RelayTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/RelayTile.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.RelayNetworkNode; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.apiimpl.network.node.RelayNetworkNode; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/SecurityManagerTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/SecurityManagerTile.java similarity index 71% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/SecurityManagerTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/SecurityManagerTile.java index fef2f12ad..11b90e95c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/SecurityManagerTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/SecurityManagerTile.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.SecurityManagerNetworkNode; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.apiimpl.network.node.SecurityManagerNetworkNode; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/StorageMonitorTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/StorageMonitorTile.java similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/StorageMonitorTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/StorageMonitorTile.java index 64730d10a..44523ce71 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/StorageMonitorTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/StorageMonitorTile.java @@ -1,10 +1,10 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.StorageMonitorNetworkNode; -import com.raoulvdberge.refinedstorage.tile.config.IComparable; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.apiimpl.network.node.StorageMonitorNetworkNode; +import com.refinedmods.refinedstorage.tile.config.IComparable; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/StorageTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/StorageTile.java similarity index 67% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/StorageTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/StorageTile.java index 617a68e63..9eb6b6f86 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/StorageTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/StorageTile.java @@ -1,15 +1,15 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.storage.ItemStorageType; -import com.raoulvdberge.refinedstorage.tile.config.IAccessType; -import com.raoulvdberge.refinedstorage.tile.config.IComparable; -import com.raoulvdberge.refinedstorage.tile.config.IPrioritizable; -import com.raoulvdberge.refinedstorage.tile.config.IWhitelistBlacklist; -import com.raoulvdberge.refinedstorage.tile.data.RSSerializers; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import com.raoulvdberge.refinedstorage.util.StorageBlockUtils; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode; +import com.refinedmods.refinedstorage.apiimpl.storage.ItemStorageType; +import com.refinedmods.refinedstorage.tile.config.IAccessType; +import com.refinedmods.refinedstorage.tile.config.IComparable; +import com.refinedmods.refinedstorage.tile.config.IPrioritizable; +import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist; +import com.refinedmods.refinedstorage.tile.data.RSSerializers; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.util.StorageBlockUtils; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/WirelessTransmitterTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/WirelessTransmitterTile.java similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/WirelessTransmitterTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/WirelessTransmitterTile.java index 8c75c6aa0..f99d87991 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/WirelessTransmitterTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/WirelessTransmitterTile.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.tile; +package com.refinedmods.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.WirelessTransmitterNetworkNode; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.apiimpl.network.node.WirelessTransmitterNetworkNode; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IAccessType.java b/src/main/java/com/refinedmods/refinedstorage/tile/config/IAccessType.java old mode 100755 new mode 100644 similarity index 59% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/config/IAccessType.java rename to src/main/java/com/refinedmods/refinedstorage/tile/config/IAccessType.java index a127575fd..e289982e9 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IAccessType.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/config/IAccessType.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.tile.config; +package com.refinedmods.refinedstorage.tile.config; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.tile.data.RSSerializers; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.api.network.node.INetworkNodeProxy; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.tile.data.RSSerializers; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.tileentity.TileEntity; public interface IAccessType { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IComparable.java b/src/main/java/com/refinedmods/refinedstorage/tile/config/IComparable.java old mode 100755 new mode 100644 similarity index 70% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/config/IComparable.java rename to src/main/java/com/refinedmods/refinedstorage/tile/config/IComparable.java index a0558d3ca..eecd2c56f --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IComparable.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/config/IComparable.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.tile.config; +package com.refinedmods.refinedstorage.tile.config; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.api.network.node.INetworkNodeProxy; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IPrioritizable.java b/src/main/java/com/refinedmods/refinedstorage/tile/config/IPrioritizable.java old mode 100755 new mode 100644 similarity index 71% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/config/IPrioritizable.java rename to src/main/java/com/refinedmods/refinedstorage/tile/config/IPrioritizable.java index 1f588fff6..fc20da5b5 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IPrioritizable.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/config/IPrioritizable.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.tile.config; +package com.refinedmods.refinedstorage.tile.config; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.api.network.node.INetworkNodeProxy; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IRedstoneConfigurable.java b/src/main/java/com/refinedmods/refinedstorage/tile/config/IRedstoneConfigurable.java old mode 100755 new mode 100644 similarity index 70% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/config/IRedstoneConfigurable.java rename to src/main/java/com/refinedmods/refinedstorage/tile/config/IRedstoneConfigurable.java index 0b16e798c..be865d845 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IRedstoneConfigurable.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/config/IRedstoneConfigurable.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.tile.config; +package com.refinedmods.refinedstorage.tile.config; public interface IRedstoneConfigurable { RedstoneMode getRedstoneMode(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IType.java b/src/main/java/com/refinedmods/refinedstorage/tile/config/IType.java old mode 100755 new mode 100644 similarity index 73% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/config/IType.java rename to src/main/java/com/refinedmods/refinedstorage/tile/config/IType.java index 1957ebcb0..449973ca0 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IType.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/config/IType.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.tile.config; +package com.refinedmods.refinedstorage.tile.config; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameterClientListener; +import com.refinedmods.refinedstorage.api.network.node.INetworkNodeProxy; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.tile.data.TileDataParameterClientListener; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.items.IItemHandlerModifiable; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IWhitelistBlacklist.java b/src/main/java/com/refinedmods/refinedstorage/tile/config/IWhitelistBlacklist.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/config/IWhitelistBlacklist.java rename to src/main/java/com/refinedmods/refinedstorage/tile/config/IWhitelistBlacklist.java index d24575e11..7f697742d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IWhitelistBlacklist.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/config/IWhitelistBlacklist.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.tile.config; +package com.refinedmods.refinedstorage.tile.config; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.api.network.node.INetworkNodeProxy; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.item.ItemStack; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/RedstoneMode.java b/src/main/java/com/refinedmods/refinedstorage/tile/config/RedstoneMode.java old mode 100755 new mode 100644 similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/config/RedstoneMode.java rename to src/main/java/com/refinedmods/refinedstorage/tile/config/RedstoneMode.java index 0d3078fd7..e9f47d273 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/RedstoneMode.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/config/RedstoneMode.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.tile.config; +package com.refinedmods.refinedstorage.tile.config; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/CraftingMonitorTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/CraftingMonitorTile.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/CraftingMonitorTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/CraftingMonitorTile.java index 080328f1a..d6b7b5949 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/CraftingMonitorTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/CraftingMonitorTile.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.tile.craftingmonitor; +package com.refinedmods.refinedstorage.tile.craftingmonitor; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.CraftingMonitorNetworkNode; -import com.raoulvdberge.refinedstorage.tile.NetworkNodeTile; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.apiimpl.network.node.CraftingMonitorNetworkNode; +import com.refinedmods.refinedstorage.tile.NetworkNodeTile; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/ICraftingMonitor.java b/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/ICraftingMonitor.java old mode 100755 new mode 100644 similarity index 75% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/ICraftingMonitor.java rename to src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/ICraftingMonitor.java index 961d5f499..ae5e308c2 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/ICraftingMonitor.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/ICraftingMonitor.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.tile.craftingmonitor; +package com.refinedmods.refinedstorage.tile.craftingmonitor; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingManager; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingManager; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTask; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java b/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java old mode 100755 new mode 100644 similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java rename to src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java index 657ef332e..6b82d6107 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java @@ -1,13 +1,13 @@ -package com.raoulvdberge.refinedstorage.tile.craftingmonitor; +package com.refinedmods.refinedstorage.tile.craftingmonitor; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingManager; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.item.WirelessCraftingMonitorItem; -import com.raoulvdberge.refinedstorage.network.craftingmonitor.WirelessCraftingMonitorSettingsUpdateMessage; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.autocrafting.ICraftingManager; +import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTask; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.item.WirelessCraftingMonitorItem; +import com.refinedmods.refinedstorage.network.craftingmonitor.WirelessCraftingMonitorSettingsUpdateMessage; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.util.NetworkUtils; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/data/RSSerializers.java b/src/main/java/com/refinedmods/refinedstorage/tile/data/RSSerializers.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/data/RSSerializers.java rename to src/main/java/com/refinedmods/refinedstorage/tile/data/RSSerializers.java index a2cdd2cf0..1b33fa318 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/data/RSSerializers.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/data/RSSerializers.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.tile.data; +package com.refinedmods.refinedstorage.tile.data; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.tile.ClientNode; -import com.raoulvdberge.refinedstorage.util.AccessTypeUtils; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.tile.ClientNode; +import com.refinedmods.refinedstorage.util.AccessTypeUtils; import net.minecraft.network.PacketBuffer; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.IDataSerializer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataManager.java b/src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataManager.java old mode 100755 new mode 100644 similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataManager.java rename to src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataManager.java index 929edffa7..da4b5c7c2 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataManager.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.tile.data; +package com.refinedmods.refinedstorage.tile.data; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.network.tiledata.TileDataParameterUpdateMessage; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.network.tiledata.TileDataParameterUpdateMessage; import net.minecraft.tileentity.TileEntity; import java.util.ArrayList; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataParameter.java b/src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataParameter.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataParameter.java rename to src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataParameter.java index c1955f19b..59eea59f2 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataParameter.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataParameter.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.tile.data; +package com.refinedmods.refinedstorage.tile.data; import net.minecraft.network.datasync.IDataSerializer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataParameterClientListener.java b/src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataParameterClientListener.java similarity index 66% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataParameterClientListener.java rename to src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataParameterClientListener.java index 87735813d..dabbc2788 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataParameterClientListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataParameterClientListener.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.tile.data; +package com.refinedmods.refinedstorage.tile.data; public interface TileDataParameterClientListener { void onChanged(boolean initial, T value); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataWatcher.java b/src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataWatcher.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataWatcher.java rename to src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataWatcher.java index 5599eab34..6570e7a88 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataWatcher.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/data/TileDataWatcher.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.tile.data; +package com.refinedmods.refinedstorage.tile.data; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.network.tiledata.TileDataParameterMessage; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.network.tiledata.TileDataParameterMessage; import net.minecraft.entity.player.ServerPlayerEntity; public class TileDataWatcher { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/GridTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/GridTile.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/grid/GridTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/grid/GridTile.java index 611c75371..7ab712ed8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/GridTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/GridTile.java @@ -1,15 +1,15 @@ -package com.raoulvdberge.refinedstorage.tile.grid; +package com.refinedmods.refinedstorage.tile.grid; -import com.raoulvdberge.refinedstorage.api.network.grid.GridType; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.GridNetworkNode; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; -import com.raoulvdberge.refinedstorage.tile.NetworkNodeTile; -import com.raoulvdberge.refinedstorage.tile.config.IType; -import com.raoulvdberge.refinedstorage.tile.data.RSSerializers; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import com.raoulvdberge.refinedstorage.util.GridUtils; +import com.refinedmods.refinedstorage.api.network.grid.GridType; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.grid.GridScreen; +import com.refinedmods.refinedstorage.tile.NetworkNodeTile; +import com.refinedmods.refinedstorage.tile.config.IType; +import com.refinedmods.refinedstorage.tile.data.RSSerializers; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.util.GridUtils; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessFluidGrid.java old mode 100755 new mode 100644 similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java rename to src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessFluidGrid.java index 3622063af..4534948aa --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessFluidGrid.java @@ -1,21 +1,21 @@ -package com.raoulvdberge.refinedstorage.tile.grid; +package com.refinedmods.refinedstorage.tile.grid; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.grid.*; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IFluidGridHandler; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; -import com.raoulvdberge.refinedstorage.api.util.IFilter; -import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener.FluidGridStorageCacheListener; -import com.raoulvdberge.refinedstorage.inventory.item.FilterItemHandler; -import com.raoulvdberge.refinedstorage.item.WirelessFluidGridItem; -import com.raoulvdberge.refinedstorage.network.grid.WirelessFluidGridSettingsUpdateMessage; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.grid.*; +import com.refinedmods.refinedstorage.api.network.grid.handler.IFluidGridHandler; +import com.refinedmods.refinedstorage.api.network.grid.handler.IItemGridHandler; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCache; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCacheListener; +import com.refinedmods.refinedstorage.api.util.IFilter; +import com.refinedmods.refinedstorage.apiimpl.storage.cache.listener.FluidGridStorageCacheListener; +import com.refinedmods.refinedstorage.inventory.item.FilterItemHandler; +import com.refinedmods.refinedstorage.item.WirelessFluidGridItem; +import com.refinedmods.refinedstorage.network.grid.WirelessFluidGridSettingsUpdateMessage; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.grid.GridScreen; +import com.refinedmods.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.CraftResultInventory; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessGrid.java old mode 100755 new mode 100644 similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java rename to src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessGrid.java index 344782291..48aaff156 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessGrid.java @@ -1,21 +1,21 @@ -package com.raoulvdberge.refinedstorage.tile.grid; +package com.refinedmods.refinedstorage.tile.grid; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.grid.*; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IFluidGridHandler; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; -import com.raoulvdberge.refinedstorage.api.util.IFilter; -import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener.ItemGridStorageCacheListener; -import com.raoulvdberge.refinedstorage.inventory.item.FilterItemHandler; -import com.raoulvdberge.refinedstorage.item.WirelessGridItem; -import com.raoulvdberge.refinedstorage.network.grid.WirelessGridSettingsUpdateMessage; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; -import com.raoulvdberge.refinedstorage.util.NetworkUtils; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.grid.*; +import com.refinedmods.refinedstorage.api.network.grid.handler.IFluidGridHandler; +import com.refinedmods.refinedstorage.api.network.grid.handler.IItemGridHandler; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCache; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCacheListener; +import com.refinedmods.refinedstorage.api.util.IFilter; +import com.refinedmods.refinedstorage.apiimpl.storage.cache.listener.ItemGridStorageCacheListener; +import com.refinedmods.refinedstorage.inventory.item.FilterItemHandler; +import com.refinedmods.refinedstorage.item.WirelessGridItem; +import com.refinedmods.refinedstorage.network.grid.WirelessGridSettingsUpdateMessage; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.grid.GridScreen; +import com.refinedmods.refinedstorage.util.NetworkUtils; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.CraftResultInventory; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/IPortableGrid.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/IPortableGrid.java similarity index 75% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/IPortableGrid.java rename to src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/IPortableGrid.java index 37f4cab98..ae6e050a5 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/IPortableGrid.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/IPortableGrid.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.tile.grid.portable; +package com.refinedmods.refinedstorage.tile.grid.portable; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.tracker.IStorageTracker; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCache; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.tracker.IStorageTracker; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.items.IItemHandlerModifiable; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java rename to src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java index 8f2330f91..2e425fe6e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java @@ -1,43 +1,43 @@ -package com.raoulvdberge.refinedstorage.tile.grid.portable; +package com.refinedmods.refinedstorage.tile.grid.portable; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.api.network.grid.GridType; -import com.raoulvdberge.refinedstorage.api.network.grid.ICraftingGridListener; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.api.network.grid.IGridTab; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IFluidGridHandler; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.StorageType; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; -import com.raoulvdberge.refinedstorage.api.storage.cache.InvalidateCause; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider; -import com.raoulvdberge.refinedstorage.api.storage.disk.StorageDiskSyncData; -import com.raoulvdberge.refinedstorage.api.util.IFilter; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.network.grid.handler.PortableFluidGridHandler; -import com.raoulvdberge.refinedstorage.apiimpl.network.grid.handler.PortableItemGridHandler; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.DiskState; -import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.PortableFluidStorageCache; -import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.PortableItemStorageCache; -import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener.PortableFluidGridStorageCacheListener; -import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener.PortableItemGridStorageCacheListener; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.PortableFluidStorageDisk; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.PortableItemStorageDisk; -import com.raoulvdberge.refinedstorage.apiimpl.storage.tracker.FluidStorageTracker; -import com.raoulvdberge.refinedstorage.apiimpl.storage.tracker.ItemStorageTracker; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.FilterItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.validator.StorageDiskItemValidator; -import com.raoulvdberge.refinedstorage.item.WirelessGridItem; -import com.raoulvdberge.refinedstorage.item.blockitem.PortableGridBlockItem; -import com.raoulvdberge.refinedstorage.network.grid.PortableGridSettingsUpdateMessage; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; -import com.raoulvdberge.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.api.network.grid.GridType; +import com.refinedmods.refinedstorage.api.network.grid.ICraftingGridListener; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.api.network.grid.IGridTab; +import com.refinedmods.refinedstorage.api.network.grid.handler.IFluidGridHandler; +import com.refinedmods.refinedstorage.api.network.grid.handler.IItemGridHandler; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.StorageType; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCache; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCacheListener; +import com.refinedmods.refinedstorage.api.storage.cache.InvalidateCause; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskProvider; +import com.refinedmods.refinedstorage.api.storage.disk.StorageDiskSyncData; +import com.refinedmods.refinedstorage.api.util.IFilter; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.network.grid.handler.PortableFluidGridHandler; +import com.refinedmods.refinedstorage.apiimpl.network.grid.handler.PortableItemGridHandler; +import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState; +import com.refinedmods.refinedstorage.apiimpl.storage.cache.PortableFluidStorageCache; +import com.refinedmods.refinedstorage.apiimpl.storage.cache.PortableItemStorageCache; +import com.refinedmods.refinedstorage.apiimpl.storage.cache.listener.PortableFluidGridStorageCacheListener; +import com.refinedmods.refinedstorage.apiimpl.storage.cache.listener.PortableItemGridStorageCacheListener; +import com.refinedmods.refinedstorage.apiimpl.storage.disk.PortableFluidStorageDisk; +import com.refinedmods.refinedstorage.apiimpl.storage.disk.PortableItemStorageDisk; +import com.refinedmods.refinedstorage.apiimpl.storage.tracker.FluidStorageTracker; +import com.refinedmods.refinedstorage.apiimpl.storage.tracker.ItemStorageTracker; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.item.FilterItemHandler; +import com.refinedmods.refinedstorage.inventory.item.validator.StorageDiskItemValidator; +import com.refinedmods.refinedstorage.item.WirelessGridItem; +import com.refinedmods.refinedstorage.item.blockitem.PortableGridBlockItem; +import com.refinedmods.refinedstorage.network.grid.PortableGridSettingsUpdateMessage; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.grid.GridScreen; +import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.CraftResultInventory; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGridDiskState.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridDiskState.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGridDiskState.java rename to src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridDiskState.java index 1c182db54..7d069cfb3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGridDiskState.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridDiskState.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.tile.grid.portable; +package com.refinedmods.refinedstorage.tile.grid.portable; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGridTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGridTile.java rename to src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java index 77027483d..5d5414a8a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGridTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java @@ -1,53 +1,53 @@ -package com.raoulvdberge.refinedstorage.tile.grid.portable; +package com.refinedmods.refinedstorage.tile.grid.portable; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.api.network.grid.GridType; -import com.raoulvdberge.refinedstorage.api.network.grid.ICraftingGridListener; -import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.api.network.grid.IGridTab; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IFluidGridHandler; -import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.StorageType; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; -import com.raoulvdberge.refinedstorage.api.storage.cache.InvalidateCause; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider; -import com.raoulvdberge.refinedstorage.api.storage.tracker.IStorageTracker; -import com.raoulvdberge.refinedstorage.api.util.IFilter; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.network.grid.handler.PortableFluidGridHandler; -import com.raoulvdberge.refinedstorage.apiimpl.network.grid.handler.PortableItemGridHandler; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.DiskState; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.GridNetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.PortableFluidStorageCache; -import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.PortableItemStorageCache; -import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener.PortableFluidGridStorageCacheListener; -import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener.PortableItemGridStorageCacheListener; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.PortableFluidStorageDisk; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.PortableItemStorageDisk; -import com.raoulvdberge.refinedstorage.apiimpl.storage.tracker.FluidStorageTracker; -import com.raoulvdberge.refinedstorage.apiimpl.storage.tracker.ItemStorageTracker; -import com.raoulvdberge.refinedstorage.block.PortableGridBlock; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.FilterItemHandler; -import com.raoulvdberge.refinedstorage.inventory.item.validator.StorageDiskItemValidator; -import com.raoulvdberge.refinedstorage.inventory.listener.TileInventoryListener; -import com.raoulvdberge.refinedstorage.item.WirelessGridItem; -import com.raoulvdberge.refinedstorage.item.blockitem.PortableGridBlockItem; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; -import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; -import com.raoulvdberge.refinedstorage.tile.BaseTile; -import com.raoulvdberge.refinedstorage.tile.config.IRedstoneConfigurable; -import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import com.raoulvdberge.refinedstorage.tile.grid.GridTile; -import com.raoulvdberge.refinedstorage.util.StackUtils; -import com.raoulvdberge.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.api.network.grid.GridType; +import com.refinedmods.refinedstorage.api.network.grid.ICraftingGridListener; +import com.refinedmods.refinedstorage.api.network.grid.IGrid; +import com.refinedmods.refinedstorage.api.network.grid.IGridTab; +import com.refinedmods.refinedstorage.api.network.grid.handler.IFluidGridHandler; +import com.refinedmods.refinedstorage.api.network.grid.handler.IItemGridHandler; +import com.refinedmods.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.StorageType; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCache; +import com.refinedmods.refinedstorage.api.storage.cache.IStorageCacheListener; +import com.refinedmods.refinedstorage.api.storage.cache.InvalidateCause; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskProvider; +import com.refinedmods.refinedstorage.api.storage.tracker.IStorageTracker; +import com.refinedmods.refinedstorage.api.util.IFilter; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.apiimpl.network.grid.handler.PortableFluidGridHandler; +import com.refinedmods.refinedstorage.apiimpl.network.grid.handler.PortableItemGridHandler; +import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState; +import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; +import com.refinedmods.refinedstorage.apiimpl.storage.cache.PortableFluidStorageCache; +import com.refinedmods.refinedstorage.apiimpl.storage.cache.PortableItemStorageCache; +import com.refinedmods.refinedstorage.apiimpl.storage.cache.listener.PortableFluidGridStorageCacheListener; +import com.refinedmods.refinedstorage.apiimpl.storage.cache.listener.PortableItemGridStorageCacheListener; +import com.refinedmods.refinedstorage.apiimpl.storage.disk.PortableFluidStorageDisk; +import com.refinedmods.refinedstorage.apiimpl.storage.disk.PortableItemStorageDisk; +import com.refinedmods.refinedstorage.apiimpl.storage.tracker.FluidStorageTracker; +import com.refinedmods.refinedstorage.apiimpl.storage.tracker.ItemStorageTracker; +import com.refinedmods.refinedstorage.block.PortableGridBlock; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.inventory.item.FilterItemHandler; +import com.refinedmods.refinedstorage.inventory.item.validator.StorageDiskItemValidator; +import com.refinedmods.refinedstorage.inventory.listener.TileInventoryListener; +import com.refinedmods.refinedstorage.item.WirelessGridItem; +import com.refinedmods.refinedstorage.item.blockitem.PortableGridBlockItem; +import com.refinedmods.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.screen.grid.GridScreen; +import com.refinedmods.refinedstorage.tile.BaseTile; +import com.refinedmods.refinedstorage.tile.config.IRedstoneConfigurable; +import com.refinedmods.refinedstorage.tile.config.RedstoneMode; +import com.refinedmods.refinedstorage.tile.data.TileDataManager; +import com.refinedmods.refinedstorage.tile.data.TileDataParameter; +import com.refinedmods.refinedstorage.tile.grid.GridTile; +import com.refinedmods.refinedstorage.util.StackUtils; +import com.refinedmods.refinedstorage.util.WorldUtils; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/AccessTypeUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/AccessTypeUtils.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/util/AccessTypeUtils.java rename to src/main/java/com/refinedmods/refinedstorage/util/AccessTypeUtils.java index 2583fe8ea..1c5b86e39 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/AccessTypeUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/AccessTypeUtils.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.util; +package com.refinedmods.refinedstorage.util; -import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.refinedmods.refinedstorage.api.storage.AccessType; import net.minecraft.nbt.CompoundNBT; public final class AccessTypeUtils { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/BlockUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/BlockUtils.java similarity index 78% rename from src/main/java/com/raoulvdberge/refinedstorage/util/BlockUtils.java rename to src/main/java/com/refinedmods/refinedstorage/util/BlockUtils.java index bb2c586bd..1d3c6a225 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/BlockUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/BlockUtils.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.util; +package com.refinedmods.refinedstorage.util; -import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.block.BaseBlock; -import com.raoulvdberge.refinedstorage.item.blockitem.BaseBlockItem; +import com.refinedmods.refinedstorage.RS; +import com.refinedmods.refinedstorage.block.BaseBlock; +import com.refinedmods.refinedstorage.item.blockitem.BaseBlockItem; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/CollisionUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/CollisionUtils.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/util/CollisionUtils.java rename to src/main/java/com/refinedmods/refinedstorage/util/CollisionUtils.java index a241f25aa..fd959ab2e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/CollisionUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/CollisionUtils.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.util; +package com.refinedmods.refinedstorage.util; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/DirectionUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/DirectionUtils.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/util/DirectionUtils.java rename to src/main/java/com/refinedmods/refinedstorage/util/DirectionUtils.java index 395ca4280..d1cb5550e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/DirectionUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/DirectionUtils.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.util; +package com.refinedmods.refinedstorage.util; import net.minecraft.entity.LivingEntity; import net.minecraft.util.Direction; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/FluidStorageBlockUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/FluidStorageBlockUtils.java similarity index 84% rename from src/main/java/com/raoulvdberge/refinedstorage/util/FluidStorageBlockUtils.java rename to src/main/java/com/refinedmods/refinedstorage/util/FluidStorageBlockUtils.java index aec6af037..7addbb36d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/FluidStorageBlockUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/FluidStorageBlockUtils.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.util; +package com.refinedmods.refinedstorage.util; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.FluidStorageNetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.storage.FluidStorageType; -import com.raoulvdberge.refinedstorage.tile.FluidStorageTile; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.apiimpl.network.node.storage.FluidStorageNetworkNode; +import com.refinedmods.refinedstorage.apiimpl.storage.FluidStorageType; +import com.refinedmods.refinedstorage.tile.FluidStorageTile; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/GridUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/GridUtils.java similarity index 79% rename from src/main/java/com/raoulvdberge/refinedstorage/util/GridUtils.java rename to src/main/java/com/refinedmods/refinedstorage/util/GridUtils.java index 1c142bfe4..68fcfdf0a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/GridUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/GridUtils.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.util; +package com.refinedmods.refinedstorage.util; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.api.network.grid.GridType; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.GridNetworkNode; -import com.raoulvdberge.refinedstorage.tile.grid.GridTile; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.api.network.grid.GridType; +import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; +import com.refinedmods.refinedstorage.tile.grid.GridTile; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/NetworkUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java similarity index 84% rename from src/main/java/com/raoulvdberge/refinedstorage/util/NetworkUtils.java rename to src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java index a69cd65ca..7b6011430 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/NetworkUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.util; +package com.refinedmods.refinedstorage.util; -import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy; -import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.capability.NetworkNodeProxyCapability; +import com.refinedmods.refinedstorage.api.network.INetwork; +import com.refinedmods.refinedstorage.api.network.node.INetworkNode; +import com.refinedmods.refinedstorage.api.network.node.INetworkNodeProxy; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.api.util.Action; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.capability.NetworkNodeProxyCapability; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/PacketBufferUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/PacketBufferUtils.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/util/PacketBufferUtils.java rename to src/main/java/com/refinedmods/refinedstorage/util/PacketBufferUtils.java index c6719337b..d6e802655 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/PacketBufferUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/PacketBufferUtils.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.util; +package com.refinedmods.refinedstorage.util; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java similarity index 98% rename from src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java rename to src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java index 1d478dbd8..c8ecbf28c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.util; +package com.refinedmods.refinedstorage.util; import com.google.common.collect.Lists; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; -import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.render.Styles; -import com.raoulvdberge.refinedstorage.screen.BaseScreen; +import com.refinedmods.refinedstorage.api.util.IComparer; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.render.Styles; +import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/StackUtils.java similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java rename to src/main/java/com/refinedmods/refinedstorage/util/StackUtils.java index d410b2bb7..6d890931c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/StackUtils.java @@ -1,12 +1,12 @@ -package com.raoulvdberge.refinedstorage.util; +package com.refinedmods.refinedstorage.util; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider; -import com.raoulvdberge.refinedstorage.api.storage.tracker.StorageTrackerEntry; -import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; -import com.raoulvdberge.refinedstorage.screen.grid.stack.FluidGridStack; -import com.raoulvdberge.refinedstorage.screen.grid.stack.ItemGridStack; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; +import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskProvider; +import com.refinedmods.refinedstorage.api.storage.tracker.StorageTrackerEntry; +import com.refinedmods.refinedstorage.apiimpl.API; +import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; +import com.refinedmods.refinedstorage.screen.grid.stack.FluidGridStack; +import com.refinedmods.refinedstorage.screen.grid.stack.ItemGridStack; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/StorageBlockUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/StorageBlockUtils.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/util/StorageBlockUtils.java rename to src/main/java/com/refinedmods/refinedstorage/util/StorageBlockUtils.java index 6253871e7..4800221cf 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/StorageBlockUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/StorageBlockUtils.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.util; +package com.refinedmods.refinedstorage.util; -import com.raoulvdberge.refinedstorage.RSTiles; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.storage.ItemStorageType; -import com.raoulvdberge.refinedstorage.tile.StorageTile; +import com.refinedmods.refinedstorage.RSTiles; +import com.refinedmods.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode; +import com.refinedmods.refinedstorage.apiimpl.storage.ItemStorageType; +import com.refinedmods.refinedstorage.tile.StorageTile; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/TimeUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/TimeUtils.java similarity index 97% rename from src/main/java/com/raoulvdberge/refinedstorage/util/TimeUtils.java rename to src/main/java/com/refinedmods/refinedstorage/util/TimeUtils.java index 5d6f48c9a..35e50888e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/TimeUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/TimeUtils.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.util; +package com.refinedmods.refinedstorage.util; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/WorldUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/WorldUtils.java similarity index 97% rename from src/main/java/com/raoulvdberge/refinedstorage/util/WorldUtils.java rename to src/main/java/com/refinedmods/refinedstorage/util/WorldUtils.java index 644df8df0..4cd45924f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/WorldUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/WorldUtils.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.util; +package com.refinedmods.refinedstorage.util; import com.mojang.authlib.GameProfile; -import com.raoulvdberge.refinedstorage.render.Styles; +import com.refinedmods.refinedstorage.render.Styles; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.IInventory;