From cca8f230c7a836e36efabc6196a459a71ca54133 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Wed, 19 Oct 2016 21:49:03 +0200 Subject: [PATCH] Package rename --- build.gradle | 2 +- .../raoulvdberge}/refinedstorage/RS.java | 8 +- .../refinedstorage/RSBlocks.java | 4 +- .../refinedstorage/RSConfig.java | 2 +- .../raoulvdberge}/refinedstorage/RSGui.java | 2 +- .../raoulvdberge}/refinedstorage/RSItems.java | 4 +- .../raoulvdberge}/refinedstorage/RSUtils.java | 16 +- .../refinedstorage/api/IRSAPI.java | 16 +- .../refinedstorage/api/RSAPIInject.java | 2 +- .../api/autocrafting/ICraftingPattern.java | 6 +- .../ICraftingPatternContainer.java | 2 +- .../ICraftingPatternProvider.java | 2 +- .../ICraftingMonitorElement.java | 4 +- .../ICraftingMonitorElementRegistry.java | 2 +- .../preview/ICraftingPreviewElement.java | 11 +- .../ICraftingPreviewElementRegistry.java | 2 +- .../registry/ICraftingTaskFactory.java | 8 +- .../registry/ICraftingTaskRegistry.java | 2 +- .../api/autocrafting/task/ICraftingTask.java | 8 +- .../api/autocrafting/task/IProcessable.java | 6 +- .../api/network/INetworkMaster.java | 18 +- .../api/network/INetworkNode.java | 2 +- .../api/network/INetworkNodeGraph.java | 2 +- .../api/network/IWirelessGridConsumer.java | 2 +- .../api/network/IWirelessGridHandler.java | 2 +- .../api/network/IWirelessTransmitter.java | 2 +- .../api/network/grid/IFluidGridHandler.java | 5 +- .../api/network/grid/IItemGridHandler.java | 9 +- .../api/render/IElementDrawer.java | 22 + .../api/render/IElementDrawers.java | 23 +- .../api/solderer/ISoldererRecipe.java | 2 +- .../api/solderer/ISoldererRegistry.java | 2 +- .../api/storage/AccessType.java | 2 +- .../api/storage/fluid/IFluidStorage.java | 7 +- .../api/storage/fluid/IFluidStorageCache.java | 6 +- .../storage/fluid/IFluidStorageProvider.java | 2 +- .../api/storage/item/IItemStorage.java | 7 +- .../api/storage/item/IItemStorageCache.java | 6 +- .../storage/item/IItemStorageProvider.java | 2 +- .../refinedstorage/api/util/IComparer.java | 2 +- .../api/util/IFluidStackList.java | 5 +- .../api/util/IItemStackList.java | 7 +- .../refinedstorage/apiimpl/API.java | 34 +- .../apiimpl/autocrafting/CraftingPattern.java | 13 +- .../CraftingMonitorElementError.java | 6 +- .../CraftingMonitorElementFluidRender.java | 10 +- .../CraftingMonitorElementItemRender.java | 8 +- .../CraftingMonitorElementRegistry.java | 6 +- .../CraftingMonitorElementText.java | 8 +- .../CraftingPreviewElementFluidStack.java | 10 +- .../CraftingPreviewElementItemStack.java | 10 +- .../CraftingPreviewElementRegistry.java | 6 +- .../registry/CraftingTaskFactory.java | 22 +- .../registry/CraftingTaskRegistry.java | 6 +- .../autocrafting/task/CraftingTask.java | 39 +- .../autocrafting/task/Processable.java | 14 +- .../apiimpl/network/NetworkNodeGraph.java | 16 +- .../apiimpl/network/WirelessGridConsumer.java | 4 +- .../apiimpl/network/WirelessGridHandler.java | 12 +- .../network/grid/FluidGridHandler.java | 10 +- .../apiimpl/network/grid/ItemGridHandler.java | 17 +- .../solderer/SoldererRecipeFluidStorage.java | 14 +- .../SoldererRecipePrintedProcessor.java | 8 +- .../solderer/SoldererRecipeProcessor.java | 8 +- .../solderer/SoldererRecipeStorage.java | 14 +- .../solderer/SoldererRecipeUpgrade.java | 8 +- .../apiimpl/solderer/SoldererRegistry.java | 8 +- .../apiimpl/storage/fluid/FluidRenderer.java | 2 +- .../storage/fluid/FluidStorageCache.java | 16 +- .../storage/fluid/FluidStorageNBT.java | 8 +- .../storage/item/ItemStorageCache.java | 18 +- .../apiimpl/storage/item/ItemStorageNBT.java | 6 +- .../refinedstorage/apiimpl/util/Comparer.java | 4 +- .../apiimpl/util/FluidStackList.java | 7 +- .../apiimpl/util/ItemStackList.java | 12 +- .../refinedstorage/block/BlockBase.java | 8 +- .../refinedstorage/block/BlockCable.java | 16 +- .../block/BlockConstructor.java | 8 +- .../refinedstorage/block/BlockController.java | 12 +- .../refinedstorage/block/BlockCrafter.java | 8 +- .../block/BlockCraftingMonitor.java | 8 +- .../refinedstorage/block/BlockDestructor.java | 10 +- .../refinedstorage/block/BlockDetector.java | 8 +- .../refinedstorage/block/BlockDiskDrive.java | 8 +- .../block/BlockDiskManipulator.java | 8 +- .../refinedstorage/block/BlockExporter.java | 8 +- .../block/BlockExternalStorage.java | 8 +- .../block/BlockFluidInterface.java | 8 +- .../block/BlockFluidStorage.java | 12 +- .../refinedstorage/block/BlockGrid.java | 10 +- .../refinedstorage/block/BlockImporter.java | 8 +- .../refinedstorage/block/BlockInterface.java | 86 +-- .../block/BlockMachineCasing.java | 2 +- .../block/BlockNetworkReceiver.java | 4 +- .../block/BlockNetworkTransmitter.java | 8 +- .../refinedstorage/block/BlockNode.java | 6 +- .../block/BlockProcessingPatternEncoder.java | 8 +- .../refinedstorage/block/BlockRelay.java | 84 +-- .../refinedstorage/block/BlockSolderer.java | 8 +- .../refinedstorage/block/BlockStorage.java | 228 +++--- .../block/BlockWirelessTransmitter.java | 8 +- .../block/EnumControllerType.java | 2 +- .../block/EnumFluidStorageType.java | 2 +- .../refinedstorage/block/EnumGridType.java | 2 +- .../block/EnumItemStorageType.java | 2 +- .../block/EnumPlacementType.java | 2 +- .../container/ContainerBase.java | 294 ++++---- .../container/ContainerConstructor.java | 98 +-- .../container/ContainerController.java | 24 +- .../container/ContainerCrafter.java | 4 +- .../container/ContainerCraftingMonitor.java | 4 +- .../container/ContainerCraftingSettings.java | 4 +- .../container/ContainerDestructor.java | 104 +-- .../container/ContainerDetector.java | 56 +- .../container/ContainerDiskDrive.java | 6 +- .../container/ContainerDiskManipulator.java | 6 +- .../container/ContainerExporter.java | 102 +-- .../container/ContainerExternalStorage.java | 6 +- .../container/ContainerFluidInterface.java | 6 +- .../container/ContainerFluidStorage.java | 6 +- .../container/ContainerGrid.java | 14 +- .../container/ContainerGridFilter.java | 6 +- .../container/ContainerImporter.java | 102 +-- .../container/ContainerInterface.java | 120 ++-- .../ContainerNetworkTransmitter.java | 4 +- .../ContainerProcessingPatternEncoder.java | 8 +- .../container/ContainerRelay.java | 24 +- .../container/ContainerSolderer.java | 134 ++-- .../container/ContainerStorage.java | 60 +- .../ContainerWirelessTransmitter.java | 4 +- .../container/slot/SlotDisabled.java | 32 +- .../container/slot/SlotGridCrafting.java | 2 +- .../slot/SlotGridCraftingResult.java | 6 +- .../container/slot/SlotOutput.java | 32 +- .../container/slot/SlotSpecimen.java | 164 ++--- .../container/slot/SlotSpecimenFluid.java | 2 +- .../container/slot/SlotSpecimenLegacy.java | 2 +- .../container/slot/SlotSpecimenType.java | 4 +- .../refinedstorage/gui/GuiBase.java | 14 +- .../refinedstorage/gui/GuiConstructor.java | 88 +-- .../refinedstorage/gui/GuiController.java | 222 +++--- .../refinedstorage/gui/GuiCrafter.java | 10 +- .../gui/GuiCraftingMonitor.java | 18 +- .../gui/GuiCraftingPreview.java | 16 +- .../refinedstorage/gui/GuiDestructor.java | 88 +-- .../refinedstorage/gui/GuiDetector.java | 16 +- .../gui/GuiDiskManipulator.java | 10 +- .../refinedstorage/gui/GuiExporter.java | 84 +-- .../refinedstorage/gui/GuiFluidInterface.java | 14 +- .../refinedstorage/gui/GuiGridFilter.java | 12 +- .../refinedstorage/gui/GuiHandler.java | 16 +- .../refinedstorage/gui/GuiImporter.java | 90 +-- .../refinedstorage/gui/GuiInterface.java | 80 +-- .../gui/GuiNetworkTransmitter.java | 8 +- .../gui/GuiProcessingPatternEncoder.java | 12 +- .../refinedstorage/gui/GuiRelay.java | 66 +- .../refinedstorage/gui/GuiSolderer.java | 104 +-- .../refinedstorage/gui/GuiStorage.java | 270 +++---- .../gui/GuiWirelessTransmitter.java | 8 +- .../refinedstorage/gui/Scrollbar.java | 188 ++--- .../gui/config/ModGuiConfig.java | 4 +- .../gui/config/ModGuiFactory.java | 2 +- .../gui/grid/GridFilteredItem.java | 2 +- .../gui/grid/GuiCraftingStart.java | 12 +- .../refinedstorage/gui/grid/GuiGrid.java | 38 +- .../gui/grid/sorting/GridSorting.java | 4 +- .../gui/grid/sorting/GridSortingName.java | 6 +- .../gui/grid/sorting/GridSortingQuantity.java | 6 +- .../gui/grid/stack/ClientStackFluid.java | 6 +- .../gui/grid/stack/ClientStackItem.java | 4 +- .../gui/grid/stack/IClientStack.java | 4 +- .../gui/sidebutton/SideButton.java | 100 +-- .../gui/sidebutton/SideButtonAccessType.java | 12 +- .../gui/sidebutton/SideButtonCompare.java | 104 +-- .../sidebutton/SideButtonConstuctorDrop.java | 8 +- ...ideButtonCrafterTriggeredAutocrafting.java | 8 +- .../sidebutton/SideButtonDetectorMode.java | 78 +- .../SideButtonGridSearchBoxMode.java | 10 +- .../SideButtonGridSortingDirection.java | 78 +- .../sidebutton/SideButtonGridSortingType.java | 78 +- .../sidebutton/SideButtonGridViewType.java | 8 +- .../gui/sidebutton/SideButtonIOMode.java | 10 +- .../gui/sidebutton/SideButtonMode.java | 64 +- .../gui/sidebutton/SideButtonPickup.java | 8 +- .../sidebutton/SideButtonRedstoneMode.java | 62 +- .../gui/sidebutton/SideButtonType.java | 10 +- .../gui/sidebutton/SideButtonVoidExcess.java | 66 +- .../IntegrationCraftingTweaks.java | 6 +- .../forgeenergy/ControllerEnergyForge.java | 4 +- .../forgeenergy/WirelessGridEnergyForge.java | 4 +- .../integration/ic2/ControllerEnergyIC2.java | 4 +- .../ic2/ControllerEnergyIC2None.java | 2 +- .../integration/ic2/IControllerEnergyIC2.java | 2 +- .../integration/ic2/IntegrationIC2.java | 4 +- .../integration/jei/IntegrationJEI.java | 2 +- .../integration/jei/RSJEIPlugin.java | 6 +- .../jei/RecipeCategorySolderer.java | 2 +- .../jei/RecipeHandlerSolderer.java | 2 +- .../integration/jei/RecipeMakerSolderer.java | 6 +- .../jei/RecipeTransferHandlerGrid.java | 8 +- .../jei/RecipeTransferHandlerPattern.java | 10 +- .../jei/RecipeWrapperSolderer.java | 2 +- .../tesla/ControllerEnergyTesla.java | 2 +- .../integration/tesla/IntegrationTesla.java | 2 +- .../tesla/WirelessGridEnergyTesla.java | 4 +- .../inventory/IItemValidator.java | 8 +- .../inventory/ItemHandlerBasic.java | 2 +- .../inventory/ItemHandlerFluid.java | 4 +- .../inventory/ItemHandlerGridFilter.java | 4 +- .../ItemHandlerGridFilterInGrid.java | 10 +- .../inventory/ItemHandlerUpgrade.java | 6 +- .../inventory/ItemValidatorBasic.java | 2 +- .../refinedstorage/item/ItemBase.java | 4 +- .../refinedstorage/item/ItemBlockBase.java | 6 +- .../item/ItemBlockController.java | 10 +- .../item/ItemBlockFluidStorage.java | 12 +- .../refinedstorage/item/ItemBlockStorage.java | 190 ++--- .../refinedstorage/item/ItemCore.java | 2 +- .../item/ItemFluidStorageDisk.java | 8 +- .../item/ItemFluidStoragePart.java | 2 +- .../refinedstorage/item/ItemGridFilter.java | 12 +- .../refinedstorage/item/ItemNetworkCard.java | 4 +- .../refinedstorage/item/ItemPattern.java | 14 +- .../refinedstorage/item/ItemProcessor.java | 2 +- .../item/ItemQuartzEnrichedIron.java | 14 +- .../refinedstorage/item/ItemSilicon.java | 14 +- .../refinedstorage/item/ItemStorageDisk.java | 10 +- .../item/ItemStorageHousing.java | 2 +- .../refinedstorage/item/ItemStoragePart.java | 2 +- .../refinedstorage/item/ItemUpgrade.java | 6 +- .../refinedstorage/item/ItemWirelessGrid.java | 18 +- .../item/PatternBakedModel.java | 6 +- .../network/MessageCraftingMonitorCancel.java | 4 +- .../network/MessageGridCraftingClear.java | 6 +- .../network/MessageGridCraftingPreview.java | 4 +- .../MessageGridCraftingPreviewResponse.java | 10 +- .../network/MessageGridCraftingStart.java | 6 +- .../network/MessageGridCraftingTransfer.java | 10 +- .../network/MessageGridFilterUpdate.java | 6 +- .../network/MessageGridFluidDelta.java | 8 +- .../network/MessageGridFluidInsertHeld.java | 6 +- .../network/MessageGridFluidPull.java | 6 +- .../network/MessageGridFluidUpdate.java | 10 +- .../network/MessageGridItemDelta.java | 10 +- .../network/MessageGridItemInsertHeld.java | 6 +- .../network/MessageGridItemPull.java | 6 +- .../network/MessageGridItemUpdate.java | 10 +- .../network/MessageGridPatternCreate.java | 8 +- .../network/MessageHandlerPlayerToServer.java | 2 +- .../MessageProcessingPatternEncoderClear.java | 4 +- ...ssageProcessingPatternEncoderTransfer.java | 4 +- .../network/MessageTileDataParameter.java | 6 +- .../MessageTileDataParameterUpdate.java | 10 +- .../MessageWirelessGridSettingsUpdate.java | 10 +- .../refinedstorage/proxy/ProxyClient.java | 20 +- .../refinedstorage/proxy/ProxyCommon.java | 52 +- .../refinedstorage/tile/ClientNode.java | 4 +- .../refinedstorage/tile/IStorageGui.java | 6 +- .../refinedstorage/tile/TileBase.java | 4 +- .../refinedstorage/tile/TileCable.java | 4 +- .../refinedstorage/tile/TileConstructor.java | 28 +- .../refinedstorage/tile/TileController.java | 104 +-- .../refinedstorage/tile/TileCrafter.java | 28 +- .../tile/TileCraftingMonitor.java | 12 +- .../refinedstorage/tile/TileDestructor.java | 28 +- .../refinedstorage/tile/TileDetector.java | 34 +- .../refinedstorage/tile/TileDiskDrive.java | 40 +- .../tile/TileDiskManipulator.java | 39 +- .../refinedstorage/tile/TileExporter.java | 22 +- .../tile/TileFluidInterface.java | 24 +- .../refinedstorage/tile/TileFluidStorage.java | 32 +- .../refinedstorage/tile/TileImporter.java | 24 +- .../refinedstorage/tile/TileInterface.java | 380 +++++----- .../tile/TileMultipartNode.java | 4 +- .../tile/TileNetworkReceiver.java | 6 +- .../tile/TileNetworkTransmitter.java | 22 +- .../refinedstorage/tile/TileNode.java | 12 +- .../tile/TileProcessingPatternEncoder.java | 12 +- .../refinedstorage/tile/TileRelay.java | 64 +- .../refinedstorage/tile/TileSolderer.java | 22 +- .../refinedstorage/tile/TileStorage.java | 670 +++++++++--------- .../tile/TileWirelessTransmitter.java | 18 +- .../tile/config/IAccessType.java | 12 +- .../tile/config/IComparable.java | 8 +- .../tile/config/IExcessVoidable.java | 54 +- .../tile/config/IFilterable.java | 12 +- .../tile/config/IPrioritizable.java | 10 +- .../tile/config/IRedstoneConfigurable.java | 2 +- .../refinedstorage/tile/config/IType.java | 10 +- .../tile/config/RedstoneMode.java | 8 +- .../tile/data/ContainerListener.java | 6 +- .../tile/data/ITileDataConsumer.java | 2 +- .../tile/data/ITileDataListener.java | 2 +- .../tile/data/ITileDataProducer.java | 2 +- .../tile/data/RSSerializers.java | 12 +- .../tile/data/TileDataManager.java | 12 +- .../tile/data/TileDataParameter.java | 2 +- .../externalstorage/FluidStorageExternal.java | 14 +- .../tile/externalstorage/ItemStorageDSU.java | 8 +- .../externalstorage/ItemStorageDrawer.java | 8 +- .../externalstorage/ItemStorageExternal.java | 6 +- .../ItemStorageItemHandler.java | 8 +- .../externalstorage/TileExternalStorage.java | 34 +- .../refinedstorage/tile/grid/IGrid.java | 14 +- .../refinedstorage/tile/grid/TileGrid.java | 44 +- .../tile/grid/WirelessGrid.java | 28 +- .../api/render/IElementDrawer.java | 17 - 307 files changed, 3779 insertions(+), 3765 deletions(-) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/RS.java (85%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/RSBlocks.java (95%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/RSConfig.java (99%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/RSGui.java (96%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/RSItems.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/RSUtils.java (95%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/IRSAPI.java (70%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/RSAPIInject.java (82%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/autocrafting/ICraftingPattern.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/autocrafting/ICraftingPatternContainer.java (93%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/autocrafting/ICraftingPatternProvider.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementRegistry.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java (76%) mode change 100644 => 100755 rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/autocrafting/preview/ICraftingPreviewElementRegistry.java (92%) mode change 100644 => 100755 rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/autocrafting/registry/ICraftingTaskFactory.java (76%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/autocrafting/registry/ICraftingTaskRegistry.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/autocrafting/task/ICraftingTask.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/autocrafting/task/IProcessable.java (86%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/network/INetworkMaster.java (94%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/network/INetworkNode.java (96%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/network/INetworkNodeGraph.java (94%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/network/IWirelessGridConsumer.java (87%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/network/IWirelessGridHandler.java (96%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/network/IWirelessTransmitter.java (88%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/network/grid/IFluidGridHandler.java (87%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/network/grid/IItemGridHandler.java (88%) create mode 100755 src/main/java/com/raoulvdberge/refinedstorage/api/render/IElementDrawer.java rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/render/IElementDrawers.java (62%) mode change 100644 => 100755 rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/solderer/ISoldererRecipe.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/solderer/ISoldererRegistry.java (95%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/storage/AccessType.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/storage/fluid/IFluidStorage.java (87%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/storage/fluid/IFluidStorageCache.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/storage/fluid/IFluidStorageProvider.java (85%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/storage/item/IItemStorage.java (86%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/storage/item/IItemStorageCache.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/storage/item/IItemStorageProvider.java (85%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/util/IComparer.java (97%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/util/IFluidStackList.java (94%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/api/util/IItemStackList.java (93%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/API.java (70%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/autocrafting/CraftingPattern.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementError.java (82%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementFluidRender.java (82%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java (85%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementRegistry.java (69%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementText.java (83%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementFluidStack.java (91%) mode change 100644 => 100755 rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementItemStack.java (92%) mode change 100644 => 100755 rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementRegistry.java (71%) mode change 100644 => 100755 rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskFactory.java (78%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskRegistry.java (67%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/autocrafting/task/Processable.java (88%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/network/NetworkNodeGraph.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/network/WirelessGridConsumer.java (79%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/network/WirelessGridHandler.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/network/grid/FluidGridHandler.java (89%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/network/grid/ItemGridHandler.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/solderer/SoldererRecipeFluidStorage.java (69%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/solderer/SoldererRecipePrintedProcessor.java (88%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/solderer/SoldererRecipeProcessor.java (88%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/solderer/SoldererRecipeStorage.java (69%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/solderer/SoldererRecipeUpgrade.java (82%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/solderer/SoldererRegistry.java (89%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/storage/fluid/FluidRenderer.java (98%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/storage/fluid/FluidStorageCache.java (76%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/storage/fluid/FluidStorageNBT.java (96%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/storage/item/ItemStorageCache.java (77%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/storage/item/ItemStorageNBT.java (97%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/util/Comparer.java (96%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/util/FluidStackList.java (93%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/apiimpl/util/ItemStackList.java (89%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockBase.java (95%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockCable.java (96%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockConstructor.java (94%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockController.java (93%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockCrafter.java (85%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockCraftingMonitor.java (84%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockDestructor.java (86%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockDetector.java (93%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockDiskDrive.java (85%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockDiskManipulator.java (87%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockExporter.java (95%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockExternalStorage.java (94%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockFluidInterface.java (85%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockFluidStorage.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockGrid.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockImporter.java (95%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockInterface.java (85%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockMachineCasing.java (82%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockNetworkReceiver.java (83%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockNetworkTransmitter.java (85%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockNode.java (94%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockProcessingPatternEncoder.java (89%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockRelay.java (85%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockSolderer.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockStorage.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/BlockWirelessTransmitter.java (93%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/EnumControllerType.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/EnumFluidStorageType.java (95%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/EnumGridType.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/EnumItemStorageType.java (95%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/block/EnumPlacementType.java (96%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerBase.java (93%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerConstructor.java (88%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerController.java (70%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerCrafter.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerCraftingMonitor.java (71%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerCraftingSettings.java (95%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerDestructor.java (85%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerDetector.java (79%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerDiskDrive.java (89%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerDiskManipulator.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerExporter.java (88%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerExternalStorage.java (79%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerFluidInterface.java (89%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerFluidStorage.java (81%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerGrid.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerGridFilter.java (85%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerImporter.java (88%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerInterface.java (87%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerNetworkTransmitter.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerProcessingPatternEncoder.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerRelay.java (69%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerSolderer.java (89%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerStorage.java (81%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/ContainerWirelessTransmitter.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/slot/SlotDisabled.java (86%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/slot/SlotGridCrafting.java (81%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/slot/SlotGridCraftingResult.java (83%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/slot/SlotOutput.java (87%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/slot/SlotSpecimen.java (95%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/slot/SlotSpecimenFluid.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/slot/SlotSpecimenLegacy.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/container/slot/SlotSpecimenType.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiBase.java (95%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiConstructor.java (68%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiController.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiCrafter.java (69%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiCraftingMonitor.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiCraftingPreview.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiDestructor.java (80%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiDetector.java (81%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiDiskManipulator.java (82%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiExporter.java (70%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiFluidInterface.java (81%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiGridFilter.java (83%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiHandler.java (94%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiImporter.java (68%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiInterface.java (74%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiNetworkTransmitter.java (87%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiProcessingPatternEncoder.java (86%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiRelay.java (74%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiSolderer.java (84%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiStorage.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/GuiWirelessTransmitter.java (77%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/Scrollbar.java (94%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/config/ModGuiConfig.java (81%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/config/ModGuiFactory.java (92%) mode change 100644 => 100755 rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/grid/GridFilteredItem.java (88%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/grid/GuiCraftingStart.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/grid/GuiGrid.java (93%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/grid/sorting/GridSorting.java (67%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/grid/sorting/GridSortingName.java (73%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/grid/sorting/GridSortingQuantity.java (75%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/grid/stack/ClientStackFluid.java (89%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/grid/stack/ClientStackItem.java (96%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/grid/stack/IClientStack.java (67%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/sidebutton/SideButton.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/sidebutton/SideButtonAccessType.java (69%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/sidebutton/SideButtonCompare.java (80%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/sidebutton/SideButtonConstuctorDrop.java (73%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/sidebutton/SideButtonCrafterTriggeredAutocrafting.java (78%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java (83%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java (85%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java (83%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java (82%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/sidebutton/SideButtonGridViewType.java (83%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/sidebutton/SideButtonIOMode.java (76%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/sidebutton/SideButtonMode.java (75%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/sidebutton/SideButtonPickup.java (73%) mode change 100644 => 100755 rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java (77%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/sidebutton/SideButtonType.java (72%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/gui/sidebutton/SideButtonVoidExcess.java (78%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java (84%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/integration/forgeenergy/ControllerEnergyForge.java (88%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/integration/forgeenergy/WirelessGridEnergyForge.java (89%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/integration/ic2/ControllerEnergyIC2.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/integration/ic2/ControllerEnergyIC2None.java (80%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/integration/ic2/IControllerEnergyIC2.java (66%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/integration/ic2/IntegrationIC2.java (82%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/integration/jei/IntegrationJEI.java (75%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/integration/jei/RSJEIPlugin.java (88%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/integration/jei/RecipeCategorySolderer.java (97%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/integration/jei/RecipeHandlerSolderer.java (94%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/integration/jei/RecipeMakerSolderer.java (79%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/integration/jei/RecipeTransferHandlerPattern.java (87%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/integration/jei/RecipeWrapperSolderer.java (96%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/integration/tesla/ControllerEnergyTesla.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/integration/tesla/IntegrationTesla.java (74%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/integration/tesla/WirelessGridEnergyTesla.java (87%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/inventory/IItemValidator.java (76%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/inventory/ItemHandlerBasic.java (96%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/inventory/ItemHandlerFluid.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/inventory/ItemHandlerGridFilter.java (88%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/inventory/ItemHandlerGridFilterInGrid.java (81%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/inventory/ItemHandlerUpgrade.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/inventory/ItemValidatorBasic.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/item/ItemBase.java (87%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/item/ItemBlockBase.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/item/ItemBlockController.java (87%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/item/ItemBlockFluidStorage.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/item/ItemBlockStorage.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/item/ItemCore.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/item/ItemFluidStorageDisk.java (94%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/item/ItemFluidStoragePart.java (93%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/item/ItemGridFilter.java (85%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/item/ItemNetworkCard.java (96%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/item/ItemPattern.java (93%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/item/ItemProcessor.java (94%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/item/ItemQuartzEnrichedIron.java (75%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/item/ItemSilicon.java (69%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/item/ItemStorageDisk.java (93%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/item/ItemStorageHousing.java (73%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/item/ItemStoragePart.java (93%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/item/ItemUpgrade.java (96%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/item/ItemWirelessGrid.java (95%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/item/PatternBakedModel.java (93%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageCraftingMonitorCancel.java (93%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageGridCraftingClear.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageGridCraftingPreview.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageGridCraftingPreviewResponse.java (87%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageGridCraftingStart.java (86%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageGridCraftingTransfer.java (87%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageGridFilterUpdate.java (83%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageGridFluidDelta.java (88%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageGridFluidInsertHeld.java (82%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageGridFluidPull.java (86%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageGridFluidUpdate.java (84%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageGridItemDelta.java (86%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageGridItemInsertHeld.java (85%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageGridItemPull.java (86%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageGridItemUpdate.java (83%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageGridPatternCreate.java (85%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageHandlerPlayerToServer.java (93%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageProcessingPatternEncoderClear.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageProcessingPatternEncoderTransfer.java (93%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageTileDataParameter.java (88%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageTileDataParameterUpdate.java (83%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/network/MessageWirelessGridSettingsUpdate.java (89%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/proxy/ProxyClient.java (97%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/proxy/ProxyCommon.java (94%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/ClientNode.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/IStorageGui.java (75%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileBase.java (96%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileCable.java (71%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileConstructor.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileController.java (88%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileCrafter.java (86%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileCraftingMonitor.java (74%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileDestructor.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileDetector.java (89%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileDiskDrive.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileDiskManipulator.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileExporter.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileFluidInterface.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileFluidStorage.java (89%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileImporter.java (89%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileInterface.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileMultipartNode.java (98%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileNetworkReceiver.java (71%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileNetworkTransmitter.java (87%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileNode.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileProcessingPatternEncoder.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileRelay.java (79%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileSolderer.java (91%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileStorage.java (88%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/TileWirelessTransmitter.java (82%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/config/IAccessType.java (66%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/config/IComparable.java (74%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/config/IExcessVoidable.java (75%) mode change 100644 => 100755 rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/config/IFilterable.java (89%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/config/IPrioritizable.java (76%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/config/IRedstoneConfigurable.java (70%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/config/IType.java (78%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/config/RedstoneMode.java (86%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/data/ContainerListener.java (80%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/data/ITileDataConsumer.java (74%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/data/ITileDataListener.java (65%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/data/ITileDataProducer.java (72%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/data/RSSerializers.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/data/TileDataManager.java (89%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/data/TileDataParameter.java (97%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/externalstorage/FluidStorageExternal.java (87%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/externalstorage/ItemStorageDSU.java (94%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/externalstorage/ItemStorageDrawer.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/externalstorage/ItemStorageExternal.java (81%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/externalstorage/TileExternalStorage.java (90%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/grid/IGrid.java (61%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/grid/TileGrid.java (92%) rename src/main/java/{ => com/raoulvdberge}/refinedstorage/tile/grid/WirelessGrid.java (85%) delete mode 100644 src/main/java/refinedstorage/api/render/IElementDrawer.java diff --git a/build.gradle b/build.gradle index 627e4dc19..8b06e5a86 100755 --- a/build.gradle +++ b/build.gradle @@ -81,7 +81,7 @@ task deobfJar(type: Jar) { task apiJar(type: Jar, dependsOn: 'sourceMainJava') { from sourceSets.main.allSource from sourceSets.main.output - include 'refinedstorage/api/**/*' + include 'com/raoulvdberge/refinedstorage/api/**/*' classifier 'api' } diff --git a/src/main/java/refinedstorage/RS.java b/src/main/java/com/raoulvdberge/refinedstorage/RS.java similarity index 85% rename from src/main/java/refinedstorage/RS.java rename to src/main/java/com/raoulvdberge/refinedstorage/RS.java index c144fcbaf..aaa95bcc6 100755 --- a/src/main/java/refinedstorage/RS.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RS.java @@ -1,5 +1,6 @@ -package refinedstorage; +package com.raoulvdberge.refinedstorage; +import com.raoulvdberge.refinedstorage.proxy.ProxyCommon; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -13,7 +14,6 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import refinedstorage.proxy.ProxyCommon; @Mod(modid = RS.ID, version = RS.VERSION, guiFactory = RS.GUI_FACTORY, dependencies = RS.DEPENDENCIES) public final class RS { @@ -24,9 +24,9 @@ public final class RS { public static final String ID = "refinedstorage"; public static final String VERSION = "1.2"; public static final String DEPENDENCIES = "required-after:Forge@[12.18.1.2088,);required-after:mcmultipart@[1.2.1,);after:JEI@[3.12.0,);"; - public static final String GUI_FACTORY = "refinedstorage.gui.config.ModGuiFactory"; + public static final String GUI_FACTORY = "com.raoulvdberge.refinedstorage.gui.config.ModGuiFactory"; - @SidedProxy(clientSide = "refinedstorage.proxy.ProxyClient", serverSide = "refinedstorage.proxy.ProxyCommon") + @SidedProxy(clientSide = "com.raoulvdberge.refinedstorage.proxy.ProxyClient", serverSide = "com.raoulvdberge.refinedstorage.proxy.ProxyCommon") public static ProxyCommon PROXY; @Instance diff --git a/src/main/java/refinedstorage/RSBlocks.java b/src/main/java/com/raoulvdberge/refinedstorage/RSBlocks.java similarity index 95% rename from src/main/java/refinedstorage/RSBlocks.java rename to src/main/java/com/raoulvdberge/refinedstorage/RSBlocks.java index b89bfd341..eec76073e 100755 --- a/src/main/java/refinedstorage/RSBlocks.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RSBlocks.java @@ -1,6 +1,6 @@ -package refinedstorage; +package com.raoulvdberge.refinedstorage; -import refinedstorage.block.*; +import com.raoulvdberge.refinedstorage.block.*; public final class RSBlocks { public static final BlockController CONTROLLER = new BlockController(); diff --git a/src/main/java/refinedstorage/RSConfig.java b/src/main/java/com/raoulvdberge/refinedstorage/RSConfig.java similarity index 99% rename from src/main/java/refinedstorage/RSConfig.java rename to src/main/java/com/raoulvdberge/refinedstorage/RSConfig.java index b6e8ce949..859352602 100755 --- a/src/main/java/refinedstorage/RSConfig.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RSConfig.java @@ -1,4 +1,4 @@ -package refinedstorage; +package com.raoulvdberge.refinedstorage; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.ConfigElement; diff --git a/src/main/java/refinedstorage/RSGui.java b/src/main/java/com/raoulvdberge/refinedstorage/RSGui.java similarity index 96% rename from src/main/java/refinedstorage/RSGui.java rename to src/main/java/com/raoulvdberge/refinedstorage/RSGui.java index 2df745d09..99d1abc9e 100755 --- a/src/main/java/refinedstorage/RSGui.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RSGui.java @@ -1,4 +1,4 @@ -package refinedstorage; +package com.raoulvdberge.refinedstorage; public final class RSGui { public static final int CONTROLLER = 0; diff --git a/src/main/java/refinedstorage/RSItems.java b/src/main/java/com/raoulvdberge/refinedstorage/RSItems.java similarity index 92% rename from src/main/java/refinedstorage/RSItems.java rename to src/main/java/com/raoulvdberge/refinedstorage/RSItems.java index 1f0e1d8f9..97d016d68 100755 --- a/src/main/java/refinedstorage/RSItems.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RSItems.java @@ -1,6 +1,6 @@ -package refinedstorage; +package com.raoulvdberge.refinedstorage; -import refinedstorage.item.*; +import com.raoulvdberge.refinedstorage.item.*; public final class RSItems { public static final ItemStorageDisk STORAGE_DISK = new ItemStorageDisk(); diff --git a/src/main/java/refinedstorage/RSUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java similarity index 95% rename from src/main/java/refinedstorage/RSUtils.java rename to src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java index 3a800d74e..a84028a5d 100755 --- a/src/main/java/refinedstorage/RSUtils.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java @@ -1,5 +1,12 @@ -package refinedstorage; +package com.raoulvdberge.refinedstorage; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.api.util.IFluidStackList; +import com.raoulvdberge.refinedstorage.api.util.IItemStackList; +import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.apiimpl.storage.fluid.FluidStorageNBT; +import com.raoulvdberge.refinedstorage.apiimpl.storage.item.ItemStorageNBT; import io.netty.buffer.ByteBuf; import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; @@ -24,13 +31,6 @@ import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.InvWrapper; import net.minecraftforge.items.wrapper.SidedInvWrapper; import org.apache.commons.lang3.tuple.Pair; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.storage.AccessType; -import refinedstorage.api.util.IFluidStackList; -import refinedstorage.api.util.IItemStackList; -import refinedstorage.apiimpl.API; -import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT; -import refinedstorage.apiimpl.storage.item.ItemStorageNBT; import java.util.Locale; import java.util.function.Function; diff --git a/src/main/java/refinedstorage/api/IRSAPI.java b/src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java similarity index 70% rename from src/main/java/refinedstorage/api/IRSAPI.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java index 57b82e9de..66af5bd39 100755 --- a/src/main/java/refinedstorage/api/IRSAPI.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java @@ -1,14 +1,14 @@ -package refinedstorage.api; +package com.raoulvdberge.refinedstorage.api; +import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry; +import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry; +import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry; +import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRegistry; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.api.util.IFluidStackList; +import com.raoulvdberge.refinedstorage.api.util.IItemStackList; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry; -import refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry; -import refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry; -import refinedstorage.api.solderer.ISoldererRegistry; -import refinedstorage.api.util.IComparer; -import refinedstorage.api.util.IFluidStackList; -import refinedstorage.api.util.IItemStackList; import javax.annotation.Nonnull; diff --git a/src/main/java/refinedstorage/api/RSAPIInject.java b/src/main/java/com/raoulvdberge/refinedstorage/api/RSAPIInject.java similarity index 82% rename from src/main/java/refinedstorage/api/RSAPIInject.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/RSAPIInject.java index b8ccd3704..da3d630ff 100755 --- a/src/main/java/refinedstorage/api/RSAPIInject.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/RSAPIInject.java @@ -1,4 +1,4 @@ -package refinedstorage.api; +package com.raoulvdberge.refinedstorage.api; import java.lang.annotation.ElementType; import java.lang.annotation.Target; diff --git a/src/main/java/refinedstorage/api/autocrafting/ICraftingPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPattern.java similarity index 92% rename from src/main/java/refinedstorage/api/autocrafting/ICraftingPattern.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPattern.java index 5ced8ea29..ef7bf515f 100755 --- a/src/main/java/refinedstorage/api/autocrafting/ICraftingPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPattern.java @@ -1,7 +1,7 @@ -package refinedstorage.api.autocrafting; +package com.raoulvdberge.refinedstorage.api.autocrafting; +import com.raoulvdberge.refinedstorage.api.util.IComparer; import net.minecraft.item.ItemStack; -import refinedstorage.api.util.IComparer; import java.util.List; @@ -80,7 +80,7 @@ public interface ICraftingPattern { * Returns the quantity of items that this crafting task yields per request. * * @param requested the item requested - * @param compare the {@link refinedstorage.api.util.IComparer} flags + * @param compare the {@link IComparer} flags * @return the quantity */ int getQuantityPerRequest(ItemStack requested, int compare); diff --git a/src/main/java/refinedstorage/api/autocrafting/ICraftingPatternContainer.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternContainer.java similarity index 93% rename from src/main/java/refinedstorage/api/autocrafting/ICraftingPatternContainer.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternContainer.java index 89c77408d..9eca03671 100755 --- a/src/main/java/refinedstorage/api/autocrafting/ICraftingPatternContainer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternContainer.java @@ -1,4 +1,4 @@ -package refinedstorage.api.autocrafting; +package com.raoulvdberge.refinedstorage.api.autocrafting; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/refinedstorage/api/autocrafting/ICraftingPatternProvider.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternProvider.java similarity index 92% rename from src/main/java/refinedstorage/api/autocrafting/ICraftingPatternProvider.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternProvider.java index 0c864be78..b30c48f69 100755 --- a/src/main/java/refinedstorage/api/autocrafting/ICraftingPatternProvider.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternProvider.java @@ -1,4 +1,4 @@ -package refinedstorage.api.autocrafting; +package com.raoulvdberge.refinedstorage.api.autocrafting; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java similarity index 90% rename from src/main/java/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java index fb602c6c2..1e1b6f0bd 100755 --- a/src/main/java/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java @@ -1,9 +1,9 @@ -package refinedstorage.api.autocrafting.craftingmonitor; +package com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor; +import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import refinedstorage.api.render.IElementDrawers; /** * Represents a crafting monitor element. diff --git a/src/main/java/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementRegistry.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementRegistry.java similarity index 91% rename from src/main/java/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementRegistry.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementRegistry.java index a0a8a41a7..d7b623369 100755 --- a/src/main/java/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementRegistry.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementRegistry.java @@ -1,4 +1,4 @@ -package refinedstorage.api.autocrafting.craftingmonitor; +package com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java old mode 100644 new mode 100755 similarity index 76% rename from src/main/java/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java index 20056ea34..095a4232a --- a/src/main/java/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java @@ -1,12 +1,9 @@ -package refinedstorage.api.autocrafting.preview; +package com.raoulvdberge.refinedstorage.api.autocrafting.preview; +import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; import io.netty.buffer.ByteBuf; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import refinedstorage.api.render.IElementDrawer; -import refinedstorage.api.render.IElementDrawers; public interface ICraftingPreviewElement { /** @@ -15,8 +12,8 @@ public interface ICraftingPreviewElement { T getElement(); /** - * @param x position on the x axis to render - * @param y position on the y axis to render + * @param x position on the x axis to render + * @param y position on the y axis to render * @param drawers the drawers this element can use */ @SideOnly(Side.CLIENT) diff --git a/src/main/java/refinedstorage/api/autocrafting/preview/ICraftingPreviewElementRegistry.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/preview/ICraftingPreviewElementRegistry.java old mode 100644 new mode 100755 similarity index 92% rename from src/main/java/refinedstorage/api/autocrafting/preview/ICraftingPreviewElementRegistry.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/preview/ICraftingPreviewElementRegistry.java index 114540179..092847b80 --- a/src/main/java/refinedstorage/api/autocrafting/preview/ICraftingPreviewElementRegistry.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/preview/ICraftingPreviewElementRegistry.java @@ -1,4 +1,4 @@ -package refinedstorage.api.autocrafting.preview; +package com.raoulvdberge.refinedstorage.api.autocrafting.preview; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/refinedstorage/api/autocrafting/registry/ICraftingTaskFactory.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/registry/ICraftingTaskFactory.java similarity index 76% rename from src/main/java/refinedstorage/api/autocrafting/registry/ICraftingTaskFactory.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/registry/ICraftingTaskFactory.java index c0cf62f81..84dc58320 100755 --- a/src/main/java/refinedstorage/api/autocrafting/registry/ICraftingTaskFactory.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/registry/ICraftingTaskFactory.java @@ -1,11 +1,11 @@ -package refinedstorage.api.autocrafting.registry; +package com.raoulvdberge.refinedstorage.api.autocrafting.registry; +import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; +import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import refinedstorage.api.autocrafting.ICraftingPattern; -import refinedstorage.api.autocrafting.task.ICraftingTask; -import refinedstorage.api.network.INetworkMaster; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/refinedstorage/api/autocrafting/registry/ICraftingTaskRegistry.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/registry/ICraftingTaskRegistry.java similarity index 91% rename from src/main/java/refinedstorage/api/autocrafting/registry/ICraftingTaskRegistry.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/registry/ICraftingTaskRegistry.java index e2cb60ed2..fce282e5c 100755 --- a/src/main/java/refinedstorage/api/autocrafting/registry/ICraftingTaskRegistry.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/registry/ICraftingTaskRegistry.java @@ -1,4 +1,4 @@ -package refinedstorage.api.autocrafting.registry; +package com.raoulvdberge.refinedstorage.api.autocrafting.registry; import javax.annotation.Nullable; diff --git a/src/main/java/refinedstorage/api/autocrafting/task/ICraftingTask.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTask.java similarity index 90% rename from src/main/java/refinedstorage/api/autocrafting/task/ICraftingTask.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTask.java index 81b43b882..ec10d5be1 100755 --- a/src/main/java/refinedstorage/api/autocrafting/task/ICraftingTask.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTask.java @@ -1,10 +1,10 @@ -package refinedstorage.api.autocrafting.task; +package com.raoulvdberge.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 net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import refinedstorage.api.autocrafting.ICraftingPattern; -import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; import javax.annotation.Nullable; import java.util.List; diff --git a/src/main/java/refinedstorage/api/autocrafting/task/IProcessable.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/IProcessable.java similarity index 86% rename from src/main/java/refinedstorage/api/autocrafting/task/IProcessable.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/IProcessable.java index b1204b602..57ba9859e 100755 --- a/src/main/java/refinedstorage/api/autocrafting/task/IProcessable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/IProcessable.java @@ -1,9 +1,9 @@ -package refinedstorage.api.autocrafting.task; +package com.raoulvdberge.refinedstorage.api.autocrafting.task; +import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; +import com.raoulvdberge.refinedstorage.api.util.IItemStackList; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import refinedstorage.api.autocrafting.ICraftingPattern; -import refinedstorage.api.util.IItemStackList; /** * Represents a item in a crafting task that can be processed. diff --git a/src/main/java/refinedstorage/api/network/INetworkMaster.java b/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkMaster.java similarity index 94% rename from src/main/java/refinedstorage/api/network/INetworkMaster.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkMaster.java index aa1bce7cd..27b83f289 100755 --- a/src/main/java/refinedstorage/api/network/INetworkMaster.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkMaster.java @@ -1,19 +1,19 @@ -package refinedstorage.api.network; +package com.raoulvdberge.refinedstorage.api.network; import cofh.api.energy.EnergyStorage; +import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; +import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; +import com.raoulvdberge.refinedstorage.api.network.grid.IFluidGridHandler; +import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler; +import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorageCache; +import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorageCache; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.apiimpl.API; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; -import refinedstorage.api.autocrafting.ICraftingPattern; -import refinedstorage.api.autocrafting.task.ICraftingTask; -import refinedstorage.api.network.grid.IFluidGridHandler; -import refinedstorage.api.network.grid.IItemGridHandler; -import refinedstorage.api.storage.fluid.IFluidStorageCache; -import refinedstorage.api.storage.item.IItemStorageCache; -import refinedstorage.api.util.IComparer; -import refinedstorage.apiimpl.API; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/refinedstorage/api/network/INetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNode.java similarity index 96% rename from src/main/java/refinedstorage/api/network/INetworkNode.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNode.java index db3a919d5..1b256504a 100755 --- a/src/main/java/refinedstorage/api/network/INetworkNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNode.java @@ -1,4 +1,4 @@ -package refinedstorage.api.network; +package com.raoulvdberge.refinedstorage.api.network; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/refinedstorage/api/network/INetworkNodeGraph.java b/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNodeGraph.java similarity index 94% rename from src/main/java/refinedstorage/api/network/INetworkNodeGraph.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNodeGraph.java index b7b80f36e..411d4e5b1 100755 --- a/src/main/java/refinedstorage/api/network/INetworkNodeGraph.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNodeGraph.java @@ -1,4 +1,4 @@ -package refinedstorage.api.network; +package com.raoulvdberge.refinedstorage.api.network; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/refinedstorage/api/network/IWirelessGridConsumer.java b/src/main/java/com/raoulvdberge/refinedstorage/api/network/IWirelessGridConsumer.java similarity index 87% rename from src/main/java/refinedstorage/api/network/IWirelessGridConsumer.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/network/IWirelessGridConsumer.java index bf89fc743..6975e95a0 100755 --- a/src/main/java/refinedstorage/api/network/IWirelessGridConsumer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/network/IWirelessGridConsumer.java @@ -1,4 +1,4 @@ -package refinedstorage.api.network; +package com.raoulvdberge.refinedstorage.api.network; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/refinedstorage/api/network/IWirelessGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/api/network/IWirelessGridHandler.java similarity index 96% rename from src/main/java/refinedstorage/api/network/IWirelessGridHandler.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/network/IWirelessGridHandler.java index fb459d21c..4d433d3a7 100755 --- a/src/main/java/refinedstorage/api/network/IWirelessGridHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/network/IWirelessGridHandler.java @@ -1,4 +1,4 @@ -package refinedstorage.api.network; +package com.raoulvdberge.refinedstorage.api.network; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumHand; diff --git a/src/main/java/refinedstorage/api/network/IWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/api/network/IWirelessTransmitter.java similarity index 88% rename from src/main/java/refinedstorage/api/network/IWirelessTransmitter.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/network/IWirelessTransmitter.java index d90e70869..f52ebe5cc 100755 --- a/src/main/java/refinedstorage/api/network/IWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/network/IWirelessTransmitter.java @@ -1,4 +1,4 @@ -package refinedstorage.api.network; +package com.raoulvdberge.refinedstorage.api.network; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/refinedstorage/api/network/grid/IFluidGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IFluidGridHandler.java similarity index 87% rename from src/main/java/refinedstorage/api/network/grid/IFluidGridHandler.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IFluidGridHandler.java index b5668c84e..8572ec85f 100755 --- a/src/main/java/refinedstorage/api/network/grid/IFluidGridHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IFluidGridHandler.java @@ -1,5 +1,6 @@ -package refinedstorage.api.network.grid; +package com.raoulvdberge.refinedstorage.api.network.grid; +import com.raoulvdberge.refinedstorage.api.IRSAPI; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -13,7 +14,7 @@ public interface IFluidGridHandler { /** * Called when a player tries to extract a fluid from the grid. * - * @param hash the hash of the fluid we're trying to extract, see {@link refinedstorage.api.IRSAPI#getFluidStackHashCode(FluidStack)} + * @param hash the hash of the fluid we're trying to extract, see {@link IRSAPI#getFluidStackHashCode(FluidStack)} * @param shift true if shift click was used, false otherwise * @param player the player that is attempting the extraction */ diff --git a/src/main/java/refinedstorage/api/network/grid/IItemGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IItemGridHandler.java similarity index 88% rename from src/main/java/refinedstorage/api/network/grid/IItemGridHandler.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IItemGridHandler.java index 7e62e951d..c82937e3c 100755 --- a/src/main/java/refinedstorage/api/network/grid/IItemGridHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IItemGridHandler.java @@ -1,5 +1,6 @@ -package refinedstorage.api.network.grid; +package com.raoulvdberge.refinedstorage.api.network.grid; +import com.raoulvdberge.refinedstorage.api.IRSAPI; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -16,7 +17,7 @@ public interface IItemGridHandler { /** * Called when a player tries to extract an item from the grid. * - * @param hash the hash of the item we're trying to extract, see {@link refinedstorage.api.IRSAPI#getItemStackHashCode(ItemStack)} + * @param hash the hash of the item we're trying to extract, see {@link IRSAPI#getItemStackHashCode(ItemStack)} * @param flags how we are extracting * @param player the player that is attempting the extraction */ @@ -43,7 +44,7 @@ public interface IItemGridHandler { /** * Called when a player requests the crafting preview window to be opened. * - * @param hash the hash of the item we want a preview for, see {@link refinedstorage.api.IRSAPI#getItemStackHashCode(ItemStack)} + * @param hash the hash of the item we want a preview for, see {@link IRSAPI#getItemStackHashCode(ItemStack)} * @param quantity the amount of that item that we need a preview for */ void onCraftingPreviewRequested(EntityPlayerMP player, int hash, int quantity); @@ -51,7 +52,7 @@ public interface IItemGridHandler { /** * Called when a player requested crafting for an item. * - * @param hash the hash of the item we're requesting crafting for, see {@link refinedstorage.api.IRSAPI#getItemStackHashCode(ItemStack)} + * @param hash the hash of the item we're requesting crafting for, see {@link IRSAPI#getItemStackHashCode(ItemStack)} * @param quantity the amount of that item that has to be crafted */ void onCraftingRequested(int hash, int quantity); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/render/IElementDrawer.java b/src/main/java/com/raoulvdberge/refinedstorage/api/render/IElementDrawer.java new file mode 100755 index 000000000..0f9b49ea0 --- /dev/null +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/render/IElementDrawer.java @@ -0,0 +1,22 @@ +package com.raoulvdberge.refinedstorage.api.render; + +import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; +import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; + +/** + * This {@link FunctionalInterface} is used to define a draw/render function. + * This function use x and y coords and the element to draw. + * Usually packaged in a {@link IElementDrawers}. + * Used in {@link ICraftingPreviewElement#draw(int, int, IElementDrawers)} and {@link ICraftingMonitorElement#draw(int, int, IElementDrawers)} + * + * @param the element to draw, usually {@link String}, {@link net.minecraft.item.ItemStack} or {@link net.minecraftforge.fluids.FluidStack} + */ +@FunctionalInterface +public interface IElementDrawer { + /** + * @param x the x axis + * @param y the y axis + * @param element the element type + */ + void draw(int x, int y, T element); +} diff --git a/src/main/java/refinedstorage/api/render/IElementDrawers.java b/src/main/java/com/raoulvdberge/refinedstorage/api/render/IElementDrawers.java old mode 100644 new mode 100755 similarity index 62% rename from src/main/java/refinedstorage/api/render/IElementDrawers.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/render/IElementDrawers.java index 8f81eb1fd..3db24dc9e --- a/src/main/java/refinedstorage/api/render/IElementDrawers.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/render/IElementDrawers.java @@ -1,22 +1,36 @@ -package refinedstorage.api.render; +package com.raoulvdberge.refinedstorage.api.render; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import refinedstorage.api.render.IElementDrawer; +/** + * Interface specifying default element drawers. + */ public interface IElementDrawers { + /** + * @return an item drawer + */ default IElementDrawer getItemDrawer() { return getNullDrawer(); } + /** + * @return a fluid drawer + */ default IElementDrawer getFluidDrawer() { return getNullDrawer(); } + /** + * @return a string drawer + */ default IElementDrawer getStringDrawer() { return getNullDrawer(); } + /** + * @return a red overlay drawer + */ default IElementDrawer getRedOverlayDrawer() { return getNullDrawer(); } @@ -25,9 +39,10 @@ public interface IElementDrawers { * DO NOT OVERRIDE * * @param any type of drawer - * @return A drawer that does nothing + * @return a drawer that does nothing */ default IElementDrawer getNullDrawer() { - return (x, y, element) -> {}; + return (x, y, element) -> { + }; } } diff --git a/src/main/java/refinedstorage/api/solderer/ISoldererRecipe.java b/src/main/java/com/raoulvdberge/refinedstorage/api/solderer/ISoldererRecipe.java similarity index 92% rename from src/main/java/refinedstorage/api/solderer/ISoldererRecipe.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/solderer/ISoldererRecipe.java index 49eb6d6bf..e6eb42bc0 100755 --- a/src/main/java/refinedstorage/api/solderer/ISoldererRecipe.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/solderer/ISoldererRecipe.java @@ -1,4 +1,4 @@ -package refinedstorage.api.solderer; +package com.raoulvdberge.refinedstorage.api.solderer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/refinedstorage/api/solderer/ISoldererRegistry.java b/src/main/java/com/raoulvdberge/refinedstorage/api/solderer/ISoldererRegistry.java similarity index 95% rename from src/main/java/refinedstorage/api/solderer/ISoldererRegistry.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/solderer/ISoldererRegistry.java index 93cb7e739..e152d66c3 100755 --- a/src/main/java/refinedstorage/api/solderer/ISoldererRegistry.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/solderer/ISoldererRegistry.java @@ -1,4 +1,4 @@ -package refinedstorage.api.solderer; +package com.raoulvdberge.refinedstorage.api.solderer; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/refinedstorage/api/storage/AccessType.java b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/AccessType.java similarity index 90% rename from src/main/java/refinedstorage/api/storage/AccessType.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/storage/AccessType.java index 8acab22d4..7d34e771e 100755 --- a/src/main/java/refinedstorage/api/storage/AccessType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/AccessType.java @@ -1,4 +1,4 @@ -package refinedstorage.api.storage; +package com.raoulvdberge.refinedstorage.api.storage; /** * The access type of a storage. diff --git a/src/main/java/refinedstorage/api/storage/fluid/IFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/fluid/IFluidStorage.java similarity index 87% rename from src/main/java/refinedstorage/api/storage/fluid/IFluidStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/storage/fluid/IFluidStorage.java index e311247cf..e591058ba 100755 --- a/src/main/java/refinedstorage/api/storage/fluid/IFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/fluid/IFluidStorage.java @@ -1,7 +1,8 @@ -package refinedstorage.api.storage.fluid; +package com.raoulvdberge.refinedstorage.api.storage.fluid; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.api.util.IComparer; import net.minecraftforge.fluids.FluidStack; -import refinedstorage.api.storage.AccessType; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -35,7 +36,7 @@ public interface IFluidStorage { * * @param stack a prototype of the fluid to extract, do NOT modify * @param size the amount of that fluid that has to be extracted - * @param flags the flags to compare on, see {@link refinedstorage.api.util.IComparer} + * @param flags the flags to compare on, see {@link IComparer} * @return null if we didn't extract anything, or a stack with the result */ @Nullable diff --git a/src/main/java/refinedstorage/api/storage/fluid/IFluidStorageCache.java b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/fluid/IFluidStorageCache.java similarity index 90% rename from src/main/java/refinedstorage/api/storage/fluid/IFluidStorageCache.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/storage/fluid/IFluidStorageCache.java index 249756005..84aaa3d19 100755 --- a/src/main/java/refinedstorage/api/storage/fluid/IFluidStorageCache.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/fluid/IFluidStorageCache.java @@ -1,8 +1,8 @@ -package refinedstorage.api.storage.fluid; +package com.raoulvdberge.refinedstorage.api.storage.fluid; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.api.util.IFluidStackList; import net.minecraftforge.fluids.FluidStack; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.util.IFluidStackList; import javax.annotation.Nonnull; import java.util.List; diff --git a/src/main/java/refinedstorage/api/storage/fluid/IFluidStorageProvider.java b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/fluid/IFluidStorageProvider.java similarity index 85% rename from src/main/java/refinedstorage/api/storage/fluid/IFluidStorageProvider.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/storage/fluid/IFluidStorageProvider.java index 646e88480..82ea5bd0b 100755 --- a/src/main/java/refinedstorage/api/storage/fluid/IFluidStorageProvider.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/fluid/IFluidStorageProvider.java @@ -1,4 +1,4 @@ -package refinedstorage.api.storage.fluid; +package com.raoulvdberge.refinedstorage.api.storage.fluid; import java.util.List; diff --git a/src/main/java/refinedstorage/api/storage/item/IItemStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/item/IItemStorage.java similarity index 86% rename from src/main/java/refinedstorage/api/storage/item/IItemStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/storage/item/IItemStorage.java index ac6257c7f..64ee94e04 100755 --- a/src/main/java/refinedstorage/api/storage/item/IItemStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/item/IItemStorage.java @@ -1,7 +1,8 @@ -package refinedstorage.api.storage.item; +package com.raoulvdberge.refinedstorage.api.storage.item; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.api.util.IComparer; import net.minecraft.item.ItemStack; -import refinedstorage.api.storage.AccessType; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -35,7 +36,7 @@ public interface IItemStorage { * * @param stack a prototype of the stack to extract, do NOT modify * @param size the amount of that prototype that has to be extracted - * @param flags the flags to compare on, see {@link refinedstorage.api.util.IComparer} + * @param flags the flags to compare on, see {@link IComparer} * @return null if we didn't extract anything, or a stack with the result */ @Nullable diff --git a/src/main/java/refinedstorage/api/storage/item/IItemStorageCache.java b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/item/IItemStorageCache.java similarity index 90% rename from src/main/java/refinedstorage/api/storage/item/IItemStorageCache.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/storage/item/IItemStorageCache.java index 5ce8f18d1..0eac63f2d 100755 --- a/src/main/java/refinedstorage/api/storage/item/IItemStorageCache.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/item/IItemStorageCache.java @@ -1,8 +1,8 @@ -package refinedstorage.api.storage.item; +package com.raoulvdberge.refinedstorage.api.storage.item; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.api.util.IItemStackList; import net.minecraft.item.ItemStack; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.util.IItemStackList; import javax.annotation.Nonnull; import java.util.List; diff --git a/src/main/java/refinedstorage/api/storage/item/IItemStorageProvider.java b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/item/IItemStorageProvider.java similarity index 85% rename from src/main/java/refinedstorage/api/storage/item/IItemStorageProvider.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/storage/item/IItemStorageProvider.java index bc5a60d1e..3141b6aba 100755 --- a/src/main/java/refinedstorage/api/storage/item/IItemStorageProvider.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/item/IItemStorageProvider.java @@ -1,4 +1,4 @@ -package refinedstorage.api.storage.item; +package com.raoulvdberge.refinedstorage.api.storage.item; import java.util.List; diff --git a/src/main/java/refinedstorage/api/util/IComparer.java b/src/main/java/com/raoulvdberge/refinedstorage/api/util/IComparer.java similarity index 97% rename from src/main/java/refinedstorage/api/util/IComparer.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/util/IComparer.java index 2eacd372c..b7f9ffbec 100755 --- a/src/main/java/refinedstorage/api/util/IComparer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/util/IComparer.java @@ -1,4 +1,4 @@ -package refinedstorage.api.util; +package com.raoulvdberge.refinedstorage.api.util; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/refinedstorage/api/util/IFluidStackList.java b/src/main/java/com/raoulvdberge/refinedstorage/api/util/IFluidStackList.java similarity index 94% rename from src/main/java/refinedstorage/api/util/IFluidStackList.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/util/IFluidStackList.java index 73301ddf7..8eed20cea 100755 --- a/src/main/java/refinedstorage/api/util/IFluidStackList.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/util/IFluidStackList.java @@ -1,5 +1,6 @@ -package refinedstorage.api.util; +package com.raoulvdberge.refinedstorage.api.util; +import com.raoulvdberge.refinedstorage.api.IRSAPI; import net.minecraftforge.fluids.FluidStack; import javax.annotation.Nonnull; @@ -62,7 +63,7 @@ public interface IFluidStackList { /** * Returns a stack. * - * @param hash the hash of the stack to search for, see {@link refinedstorage.api.IRSAPI#getFluidStackHashCode(FluidStack)} + * @param hash the hash of the stack to search for, see {@link IRSAPI#getFluidStackHashCode(FluidStack)} * @return the stack, or null if no stack was found */ @Nullable diff --git a/src/main/java/refinedstorage/api/util/IItemStackList.java b/src/main/java/com/raoulvdberge/refinedstorage/api/util/IItemStackList.java similarity index 93% rename from src/main/java/refinedstorage/api/util/IItemStackList.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/util/IItemStackList.java index b96f2ed0d..98c192174 100755 --- a/src/main/java/refinedstorage/api/util/IItemStackList.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/util/IItemStackList.java @@ -1,5 +1,6 @@ -package refinedstorage.api.util; +package com.raoulvdberge.refinedstorage.api.util; +import com.raoulvdberge.refinedstorage.api.IRSAPI; import net.minecraft.item.ItemStack; import javax.annotation.Nonnull; @@ -62,7 +63,7 @@ public interface IItemStackList { /** * Returns a stack. * - * @param hash the hash of the stack to search for, see {@link refinedstorage.api.IRSAPI#getItemStackHashCode(ItemStack)} + * @param hash the hash of the stack to search for, see {@link IRSAPI#getItemStackHashCode(ItemStack)} * @return the stack, or null if no stack was found */ @Nullable @@ -74,7 +75,7 @@ public interface IItemStackList { void clear(); /** - * Removes all stacks with size zero + * Removes all stacks with size zero */ void clean(); diff --git a/src/main/java/refinedstorage/apiimpl/API.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java similarity index 70% rename from src/main/java/refinedstorage/apiimpl/API.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java index 020908ffd..30f60b269 100755 --- a/src/main/java/refinedstorage/apiimpl/API.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java @@ -1,24 +1,24 @@ -package refinedstorage.apiimpl; +package com.raoulvdberge.refinedstorage.apiimpl; +import com.raoulvdberge.refinedstorage.api.IRSAPI; +import com.raoulvdberge.refinedstorage.api.RSAPIInject; +import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry; +import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry; +import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry; +import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRegistry; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.api.util.IFluidStackList; +import com.raoulvdberge.refinedstorage.api.util.IItemStackList; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementRegistry; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementRegistry; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.registry.CraftingTaskRegistry; +import com.raoulvdberge.refinedstorage.apiimpl.solderer.SoldererRegistry; +import com.raoulvdberge.refinedstorage.apiimpl.util.Comparer; +import com.raoulvdberge.refinedstorage.apiimpl.util.FluidStackList; +import com.raoulvdberge.refinedstorage.apiimpl.util.ItemStackList; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.discovery.ASMDataTable; -import refinedstorage.api.IRSAPI; -import refinedstorage.api.RSAPIInject; -import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry; -import refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry; -import refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry; -import refinedstorage.api.solderer.ISoldererRegistry; -import refinedstorage.api.util.IComparer; -import refinedstorage.api.util.IFluidStackList; -import refinedstorage.api.util.IItemStackList; -import refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementRegistry; -import refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementRegistry; -import refinedstorage.apiimpl.autocrafting.registry.CraftingTaskRegistry; -import refinedstorage.apiimpl.solderer.SoldererRegistry; -import refinedstorage.apiimpl.util.Comparer; -import refinedstorage.apiimpl.util.FluidStackList; -import refinedstorage.apiimpl.util.ItemStackList; import javax.annotation.Nonnull; import java.lang.reflect.Field; diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/CraftingPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java similarity index 91% rename from src/main/java/refinedstorage/apiimpl/autocrafting/CraftingPattern.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java index e54d105b8..5044d4b79 100755 --- a/src/main/java/refinedstorage/apiimpl/autocrafting/CraftingPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java @@ -1,17 +1,16 @@ -package refinedstorage.apiimpl.autocrafting; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting; +import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; +import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer; +import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.registry.CraftingTaskFactory; +import com.raoulvdberge.refinedstorage.item.ItemPattern; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.world.World; -import net.minecraftforge.items.ItemHandlerHelper; -import refinedstorage.api.autocrafting.ICraftingPattern; -import refinedstorage.api.autocrafting.ICraftingPatternContainer; -import refinedstorage.apiimpl.API; -import refinedstorage.apiimpl.autocrafting.registry.CraftingTaskFactory; -import refinedstorage.item.ItemPattern; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementError.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementError.java similarity index 82% rename from src/main/java/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementError.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementError.java index 920ec40b9..2286d2599 100755 --- a/src/main/java/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementError.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementError.java @@ -1,9 +1,9 @@ -package refinedstorage.apiimpl.autocrafting.craftingmonitor; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor; +import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; +import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.common.network.ByteBufUtils; -import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import refinedstorage.api.render.IElementDrawers; public class CraftingMonitorElementError implements ICraftingMonitorElement { public static final String ID = "error"; diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementFluidRender.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementFluidRender.java similarity index 82% rename from src/main/java/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementFluidRender.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementFluidRender.java index 7538fcf04..a4d73e67b 100755 --- a/src/main/java/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementFluidRender.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementFluidRender.java @@ -1,14 +1,14 @@ -package refinedstorage.apiimpl.autocrafting.craftingmonitor; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; +import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; +import com.raoulvdberge.refinedstorage.gui.GuiBase; import io.netty.buffer.ByteBuf; import net.minecraft.client.renderer.GlStateManager; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import refinedstorage.RSUtils; -import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import refinedstorage.api.render.IElementDrawers; -import refinedstorage.gui.GuiBase; public class CraftingMonitorElementFluidRender implements ICraftingMonitorElement { public static final String ID = "fluid_render"; diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java similarity index 85% rename from src/main/java/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java index a7536af2e..5c1ede8c2 100755 --- a/src/main/java/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java @@ -1,14 +1,14 @@ -package refinedstorage.apiimpl.autocrafting.craftingmonitor; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor; +import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; +import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; +import com.raoulvdberge.refinedstorage.gui.GuiBase; import io.netty.buffer.ByteBuf; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import refinedstorage.api.render.IElementDrawers; -import refinedstorage.gui.GuiBase; public class CraftingMonitorElementItemRender implements ICraftingMonitorElement { public static final String ID = "item_render"; diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementRegistry.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementRegistry.java similarity index 69% rename from src/main/java/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementRegistry.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementRegistry.java index 7204678ab..62289d57a 100755 --- a/src/main/java/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementRegistry.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementRegistry.java @@ -1,8 +1,8 @@ -package refinedstorage.apiimpl.autocrafting.craftingmonitor; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor; +import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; +import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry; import io.netty.buffer.ByteBuf; -import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry; import javax.annotation.Nullable; import java.util.HashMap; diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementText.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementText.java similarity index 83% rename from src/main/java/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementText.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementText.java index ce356774f..90e12bc26 100755 --- a/src/main/java/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementText.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementText.java @@ -1,14 +1,14 @@ -package refinedstorage.apiimpl.autocrafting.craftingmonitor; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor; +import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; +import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; +import com.raoulvdberge.refinedstorage.gui.GuiBase; import io.netty.buffer.ByteBuf; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import refinedstorage.api.render.IElementDrawers; -import refinedstorage.gui.GuiBase; public class CraftingMonitorElementText implements ICraftingMonitorElement { public static final String ID = "text"; diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementFluidStack.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementFluidStack.java old mode 100644 new mode 100755 similarity index 91% rename from src/main/java/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementFluidStack.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementFluidStack.java index 060b38a38..6992835d0 --- a/src/main/java/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementFluidStack.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementFluidStack.java @@ -1,8 +1,10 @@ -package refinedstorage.apiimpl.autocrafting.preview; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview; +import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; +import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; +import com.raoulvdberge.refinedstorage.gui.GuiBase; import io.netty.buffer.ByteBuf; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -10,10 +12,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; -import refinedstorage.api.render.IElementDrawer; -import refinedstorage.api.render.IElementDrawers; -import refinedstorage.gui.GuiBase; public class CraftingPreviewElementFluidStack implements ICraftingPreviewElement { public static final String ID = "fluid_renderer"; diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementItemStack.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementItemStack.java old mode 100644 new mode 100755 similarity index 92% rename from src/main/java/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementItemStack.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementItemStack.java index c6fe0b12c..317aaaf9a --- a/src/main/java/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementItemStack.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementItemStack.java @@ -1,19 +1,17 @@ -package refinedstorage.apiimpl.autocrafting.preview; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview; +import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; +import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; +import com.raoulvdberge.refinedstorage.gui.GuiBase; import io.netty.buffer.ByteBuf; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.ItemHandlerHelper; -import refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; -import refinedstorage.api.render.IElementDrawer; -import refinedstorage.api.render.IElementDrawers; -import refinedstorage.gui.GuiBase; public class CraftingPreviewElementItemStack implements ICraftingPreviewElement { public static final String ID = "item_renderer"; diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementRegistry.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementRegistry.java old mode 100644 new mode 100755 similarity index 71% rename from src/main/java/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementRegistry.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementRegistry.java index 77bee52c4..fe547247b --- a/src/main/java/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementRegistry.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementRegistry.java @@ -1,8 +1,8 @@ -package refinedstorage.apiimpl.autocrafting.preview; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview; +import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; +import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry; import io.netty.buffer.ByteBuf; -import refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; -import refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry; import javax.annotation.Nullable; import java.util.HashMap; diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskFactory.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskFactory.java similarity index 78% rename from src/main/java/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskFactory.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskFactory.java index ac5184fa7..8f4c3db38 100755 --- a/src/main/java/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskFactory.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskFactory.java @@ -1,21 +1,21 @@ -package refinedstorage.apiimpl.autocrafting.registry; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.registry; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; +import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskFactory; +import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; +import com.raoulvdberge.refinedstorage.api.autocrafting.task.IProcessable; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.api.util.IFluidStackList; +import com.raoulvdberge.refinedstorage.api.util.IItemStackList; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingTask; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.Processable; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; import net.minecraftforge.fluids.FluidStack; -import refinedstorage.RSUtils; -import refinedstorage.api.autocrafting.ICraftingPattern; -import refinedstorage.api.autocrafting.registry.ICraftingTaskFactory; -import refinedstorage.api.autocrafting.task.ICraftingTask; -import refinedstorage.api.autocrafting.task.IProcessable; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.util.IFluidStackList; -import refinedstorage.api.util.IItemStackList; -import refinedstorage.apiimpl.autocrafting.task.CraftingTask; -import refinedstorage.apiimpl.autocrafting.task.Processable; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskRegistry.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskRegistry.java similarity index 67% rename from src/main/java/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskRegistry.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskRegistry.java index 7f83ef266..efb47feaa 100755 --- a/src/main/java/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskRegistry.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskRegistry.java @@ -1,7 +1,7 @@ -package refinedstorage.apiimpl.autocrafting.registry; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.registry; -import refinedstorage.api.autocrafting.registry.ICraftingTaskFactory; -import refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry; +import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskFactory; +import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry; import javax.annotation.Nullable; import java.util.HashMap; diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java similarity index 92% rename from src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java index e05fb311d..aeaf52212 100755 --- a/src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java @@ -1,33 +1,32 @@ -package refinedstorage.apiimpl.autocrafting.task; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task; +import com.raoulvdberge.refinedstorage.RSUtils; +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.autocrafting.task.ICraftingTask; +import com.raoulvdberge.refinedstorage.api.autocrafting.task.IProcessable; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.api.util.IFluidStackList; +import com.raoulvdberge.refinedstorage.api.util.IItemStackList; +import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementError; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementFluidRender; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementItemRender; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementText; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementFluidStack; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementItemStack; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; -import refinedstorage.RSUtils; -import refinedstorage.api.autocrafting.ICraftingPattern; -import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; -import refinedstorage.api.autocrafting.task.ICraftingTask; -import refinedstorage.api.autocrafting.task.IProcessable; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.util.IComparer; -import refinedstorage.api.util.IFluidStackList; -import refinedstorage.api.util.IItemStackList; -import refinedstorage.apiimpl.API; -import refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementError; -import refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementFluidRender; -import refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementItemRender; -import refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementText; -import refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementFluidStack; -import refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementItemStack; import javax.annotation.Nullable; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; public class CraftingTask implements ICraftingTask { private static final int DEFAULT_COMPARE = IComparer.COMPARE_DAMAGE | IComparer.COMPARE_NBT; @@ -64,7 +63,7 @@ public class CraftingTask implements ICraftingTask { this.quantity = quantity; } - public CraftingTask(INetworkMaster network, @Nullable ItemStack requested, ICraftingPattern pattern, int quantity, List toProcess, IItemStackList toTake, IItemStackList internalToTake, IFluidStackList toTakeFluids, Deque toInsert, IItemStackList took, List tookFluids) { + public CraftingTask(INetworkMaster network, @Nullable ItemStack requested, ICraftingPattern pattern, int quantity, List toProcess, IItemStackList toTake, IItemStackList internalToTake, IFluidStackList toTakeFluids, Deque toInsert, IItemStackList took, List tookFluids) { this(network, requested, pattern, quantity); this.toProcess = toProcess; diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/task/Processable.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/Processable.java similarity index 88% rename from src/main/java/refinedstorage/apiimpl/autocrafting/task/Processable.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/Processable.java index e3b0adb61..ab3504c87 100755 --- a/src/main/java/refinedstorage/apiimpl/autocrafting/task/Processable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/Processable.java @@ -1,14 +1,14 @@ -package refinedstorage.apiimpl.autocrafting.task; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; +import com.raoulvdberge.refinedstorage.api.autocrafting.task.IProcessable; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.api.util.IItemStackList; +import com.raoulvdberge.refinedstorage.apiimpl.API; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.Constants; -import refinedstorage.RSUtils; -import refinedstorage.api.autocrafting.ICraftingPattern; -import refinedstorage.api.autocrafting.task.IProcessable; -import refinedstorage.api.util.IComparer; -import refinedstorage.api.util.IItemStackList; -import refinedstorage.apiimpl.API; public class Processable implements IProcessable { private static final String NBT_SATISFIED = "Satisfied_%d"; diff --git a/src/main/java/refinedstorage/apiimpl/network/NetworkNodeGraph.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java similarity index 90% rename from src/main/java/refinedstorage/apiimpl/network/NetworkNodeGraph.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java index 9441ed8b1..5b25d65fc 100755 --- a/src/main/java/refinedstorage/apiimpl/network/NetworkNodeGraph.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java @@ -1,17 +1,17 @@ -package refinedstorage.apiimpl.network; +package com.raoulvdberge.refinedstorage.apiimpl.network; +import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer; +import com.raoulvdberge.refinedstorage.api.network.INetworkNode; +import com.raoulvdberge.refinedstorage.api.network.INetworkNodeGraph; +import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorageProvider; +import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorageProvider; +import com.raoulvdberge.refinedstorage.tile.TileController; +import com.raoulvdberge.refinedstorage.tile.TileNetworkTransmitter; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; -import refinedstorage.api.autocrafting.ICraftingPatternContainer; -import refinedstorage.api.network.INetworkNode; -import refinedstorage.api.network.INetworkNodeGraph; -import refinedstorage.api.storage.fluid.IFluidStorageProvider; -import refinedstorage.api.storage.item.IItemStorageProvider; -import refinedstorage.tile.TileController; -import refinedstorage.tile.TileNetworkTransmitter; import java.util.*; diff --git a/src/main/java/refinedstorage/apiimpl/network/WirelessGridConsumer.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/WirelessGridConsumer.java similarity index 79% rename from src/main/java/refinedstorage/apiimpl/network/WirelessGridConsumer.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/WirelessGridConsumer.java index 124145a4b..dc97397f6 100755 --- a/src/main/java/refinedstorage/apiimpl/network/WirelessGridConsumer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/WirelessGridConsumer.java @@ -1,8 +1,8 @@ -package refinedstorage.apiimpl.network; +package com.raoulvdberge.refinedstorage.apiimpl.network; +import com.raoulvdberge.refinedstorage.api.network.IWirelessGridConsumer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import refinedstorage.api.network.IWirelessGridConsumer; public class WirelessGridConsumer implements IWirelessGridConsumer { private EntityPlayer player; diff --git a/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/WirelessGridHandler.java similarity index 91% rename from src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/WirelessGridHandler.java index f9fb95a74..055bd4dde 100755 --- a/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/WirelessGridHandler.java @@ -1,15 +1,15 @@ -package refinedstorage.apiimpl.network; +package com.raoulvdberge.refinedstorage.apiimpl.network; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.api.network.*; +import com.raoulvdberge.refinedstorage.item.ItemWirelessGrid; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHand; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSGui; -import refinedstorage.RSItems; -import refinedstorage.api.network.*; -import refinedstorage.item.ItemWirelessGrid; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/refinedstorage/apiimpl/network/grid/FluidGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/FluidGridHandler.java similarity index 89% rename from src/main/java/refinedstorage/apiimpl/network/grid/FluidGridHandler.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/FluidGridHandler.java index fa60cae70..33a90a851 100755 --- a/src/main/java/refinedstorage/apiimpl/network/grid/FluidGridHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/FluidGridHandler.java @@ -1,15 +1,15 @@ -package refinedstorage.apiimpl.network.grid; +package com.raoulvdberge.refinedstorage.apiimpl.network.grid; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.api.network.grid.IFluidGridHandler; +import com.raoulvdberge.refinedstorage.apiimpl.API; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import refinedstorage.RSUtils; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.network.grid.IFluidGridHandler; -import refinedstorage.apiimpl.API; import javax.annotation.Nullable; diff --git a/src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/ItemGridHandler.java similarity index 90% rename from src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/ItemGridHandler.java index b0c9e131c..c1e6af1ca 100755 --- a/src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/ItemGridHandler.java @@ -1,18 +1,17 @@ -package refinedstorage.apiimpl.network.grid; +package com.raoulvdberge.refinedstorage.apiimpl.network.grid; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler; +import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingTask; +import com.raoulvdberge.refinedstorage.network.MessageGridCraftingPreviewResponse; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.ItemHandlerHelper; -import refinedstorage.RS; -import refinedstorage.api.autocrafting.ICraftingPattern; -import refinedstorage.api.autocrafting.task.ICraftingTask; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.network.grid.IItemGridHandler; -import refinedstorage.apiimpl.API; -import refinedstorage.apiimpl.autocrafting.task.CraftingTask; -import refinedstorage.network.MessageGridCraftingPreviewResponse; public class ItemGridHandler implements IItemGridHandler { private INetworkMaster network; diff --git a/src/main/java/refinedstorage/apiimpl/solderer/SoldererRecipeFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeFluidStorage.java similarity index 69% rename from src/main/java/refinedstorage/apiimpl/solderer/SoldererRecipeFluidStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeFluidStorage.java index 7f1d9beb1..f8904d3fc 100755 --- a/src/main/java/refinedstorage/apiimpl/solderer/SoldererRecipeFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeFluidStorage.java @@ -1,12 +1,12 @@ -package refinedstorage.apiimpl.solderer; +package com.raoulvdberge.refinedstorage.apiimpl.solderer; +import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRecipe; +import com.raoulvdberge.refinedstorage.block.EnumFluidStorageType; +import com.raoulvdberge.refinedstorage.item.ItemBlockFluidStorage; +import com.raoulvdberge.refinedstorage.item.ItemProcessor; import net.minecraft.item.ItemStack; -import refinedstorage.RSBlocks; -import refinedstorage.RSItems; -import refinedstorage.api.solderer.ISoldererRecipe; -import refinedstorage.block.EnumFluidStorageType; -import refinedstorage.item.ItemBlockFluidStorage; -import refinedstorage.item.ItemProcessor; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/refinedstorage/apiimpl/solderer/SoldererRecipePrintedProcessor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipePrintedProcessor.java similarity index 88% rename from src/main/java/refinedstorage/apiimpl/solderer/SoldererRecipePrintedProcessor.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipePrintedProcessor.java index 4c4ea1289..7470bd016 100755 --- a/src/main/java/refinedstorage/apiimpl/solderer/SoldererRecipePrintedProcessor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipePrintedProcessor.java @@ -1,10 +1,10 @@ -package refinedstorage.apiimpl.solderer; +package com.raoulvdberge.refinedstorage.apiimpl.solderer; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRecipe; +import com.raoulvdberge.refinedstorage.item.ItemProcessor; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import refinedstorage.RSItems; -import refinedstorage.api.solderer.ISoldererRecipe; -import refinedstorage.item.ItemProcessor; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/refinedstorage/apiimpl/solderer/SoldererRecipeProcessor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeProcessor.java similarity index 88% rename from src/main/java/refinedstorage/apiimpl/solderer/SoldererRecipeProcessor.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeProcessor.java index acb2f03d3..b88cb419f 100755 --- a/src/main/java/refinedstorage/apiimpl/solderer/SoldererRecipeProcessor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeProcessor.java @@ -1,10 +1,10 @@ -package refinedstorage.apiimpl.solderer; +package com.raoulvdberge.refinedstorage.apiimpl.solderer; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRecipe; +import com.raoulvdberge.refinedstorage.item.ItemProcessor; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import refinedstorage.RSItems; -import refinedstorage.api.solderer.ISoldererRecipe; -import refinedstorage.item.ItemProcessor; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/refinedstorage/apiimpl/solderer/SoldererRecipeStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeStorage.java similarity index 69% rename from src/main/java/refinedstorage/apiimpl/solderer/SoldererRecipeStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeStorage.java index 987099502..893ae3276 100755 --- a/src/main/java/refinedstorage/apiimpl/solderer/SoldererRecipeStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeStorage.java @@ -1,12 +1,12 @@ -package refinedstorage.apiimpl.solderer; +package com.raoulvdberge.refinedstorage.apiimpl.solderer; +import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRecipe; +import com.raoulvdberge.refinedstorage.block.EnumItemStorageType; +import com.raoulvdberge.refinedstorage.item.ItemBlockStorage; +import com.raoulvdberge.refinedstorage.item.ItemProcessor; import net.minecraft.item.ItemStack; -import refinedstorage.RSBlocks; -import refinedstorage.RSItems; -import refinedstorage.api.solderer.ISoldererRecipe; -import refinedstorage.block.EnumItemStorageType; -import refinedstorage.item.ItemBlockStorage; -import refinedstorage.item.ItemProcessor; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/refinedstorage/apiimpl/solderer/SoldererRecipeUpgrade.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeUpgrade.java similarity index 82% rename from src/main/java/refinedstorage/apiimpl/solderer/SoldererRecipeUpgrade.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeUpgrade.java index a8d2ec305..8d934ee28 100755 --- a/src/main/java/refinedstorage/apiimpl/solderer/SoldererRecipeUpgrade.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeUpgrade.java @@ -1,10 +1,10 @@ -package refinedstorage.apiimpl.solderer; +package com.raoulvdberge.refinedstorage.apiimpl.solderer; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRecipe; +import com.raoulvdberge.refinedstorage.item.ItemUpgrade; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import refinedstorage.RSItems; -import refinedstorage.api.solderer.ISoldererRecipe; -import refinedstorage.item.ItemUpgrade; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/refinedstorage/apiimpl/solderer/SoldererRegistry.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRegistry.java similarity index 89% rename from src/main/java/refinedstorage/apiimpl/solderer/SoldererRegistry.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRegistry.java index 8f774b9ab..4c3f223ec 100755 --- a/src/main/java/refinedstorage/apiimpl/solderer/SoldererRegistry.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRegistry.java @@ -1,10 +1,10 @@ -package refinedstorage.apiimpl.solderer; +package com.raoulvdberge.refinedstorage.apiimpl.solderer; +import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRecipe; +import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRegistry; +import com.raoulvdberge.refinedstorage.apiimpl.API; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; -import refinedstorage.api.solderer.ISoldererRecipe; -import refinedstorage.api.solderer.ISoldererRegistry; -import refinedstorage.apiimpl.API; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/refinedstorage/apiimpl/storage/fluid/FluidRenderer.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/fluid/FluidRenderer.java similarity index 98% rename from src/main/java/refinedstorage/apiimpl/storage/fluid/FluidRenderer.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/fluid/FluidRenderer.java index 27782528d..547dd1ae9 100755 --- a/src/main/java/refinedstorage/apiimpl/storage/fluid/FluidRenderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/fluid/FluidRenderer.java @@ -1,4 +1,4 @@ -package refinedstorage.apiimpl.storage.fluid; +package com.raoulvdberge.refinedstorage.apiimpl.storage.fluid; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/refinedstorage/apiimpl/storage/fluid/FluidStorageCache.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/fluid/FluidStorageCache.java similarity index 76% rename from src/main/java/refinedstorage/apiimpl/storage/fluid/FluidStorageCache.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/fluid/FluidStorageCache.java index 4bcc85c8a..86e7a658e 100755 --- a/src/main/java/refinedstorage/apiimpl/storage/fluid/FluidStorageCache.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/fluid/FluidStorageCache.java @@ -1,13 +1,13 @@ -package refinedstorage.apiimpl.storage.fluid; +package com.raoulvdberge.refinedstorage.apiimpl.storage.fluid; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorage; +import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorageCache; +import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorageProvider; +import com.raoulvdberge.refinedstorage.api.util.IFluidStackList; +import com.raoulvdberge.refinedstorage.apiimpl.API; import net.minecraftforge.fluids.FluidStack; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.storage.AccessType; -import refinedstorage.api.storage.fluid.IFluidStorage; -import refinedstorage.api.storage.fluid.IFluidStorageCache; -import refinedstorage.api.storage.fluid.IFluidStorageProvider; -import refinedstorage.api.util.IFluidStackList; -import refinedstorage.apiimpl.API; import javax.annotation.Nonnull; import java.util.ArrayList; diff --git a/src/main/java/refinedstorage/apiimpl/storage/fluid/FluidStorageNBT.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/fluid/FluidStorageNBT.java similarity index 96% rename from src/main/java/refinedstorage/apiimpl/storage/fluid/FluidStorageNBT.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/fluid/FluidStorageNBT.java index 3fe53daf8..c65b66077 100755 --- a/src/main/java/refinedstorage/apiimpl/storage/fluid/FluidStorageNBT.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/fluid/FluidStorageNBT.java @@ -1,13 +1,13 @@ -package refinedstorage.apiimpl.storage.fluid; +package com.raoulvdberge.refinedstorage.apiimpl.storage.fluid; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorage; +import com.raoulvdberge.refinedstorage.apiimpl.API; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidStack; -import refinedstorage.RSUtils; -import refinedstorage.api.storage.fluid.IFluidStorage; -import refinedstorage.apiimpl.API; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/src/main/java/refinedstorage/apiimpl/storage/item/ItemStorageCache.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/item/ItemStorageCache.java similarity index 77% rename from src/main/java/refinedstorage/apiimpl/storage/item/ItemStorageCache.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/item/ItemStorageCache.java index dfb8dcfb8..cac16557f 100755 --- a/src/main/java/refinedstorage/apiimpl/storage/item/ItemStorageCache.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/item/ItemStorageCache.java @@ -1,14 +1,14 @@ -package refinedstorage.apiimpl.storage.item; +package com.raoulvdberge.refinedstorage.apiimpl.storage.item; +import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorage; +import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorageCache; +import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorageProvider; +import com.raoulvdberge.refinedstorage.api.util.IItemStackList; +import com.raoulvdberge.refinedstorage.apiimpl.API; import net.minecraft.item.ItemStack; -import refinedstorage.api.autocrafting.ICraftingPattern; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.storage.AccessType; -import refinedstorage.api.storage.item.IItemStorage; -import refinedstorage.api.storage.item.IItemStorageCache; -import refinedstorage.api.storage.item.IItemStorageProvider; -import refinedstorage.api.util.IItemStackList; -import refinedstorage.apiimpl.API; import javax.annotation.Nonnull; import java.util.ArrayList; diff --git a/src/main/java/refinedstorage/apiimpl/storage/item/ItemStorageNBT.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/item/ItemStorageNBT.java similarity index 97% rename from src/main/java/refinedstorage/apiimpl/storage/item/ItemStorageNBT.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/item/ItemStorageNBT.java index 676e8ae8a..cc324ad38 100755 --- a/src/main/java/refinedstorage/apiimpl/storage/item/ItemStorageNBT.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/item/ItemStorageNBT.java @@ -1,13 +1,13 @@ -package refinedstorage.apiimpl.storage.item; +package com.raoulvdberge.refinedstorage.apiimpl.storage.item; +import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorage; +import com.raoulvdberge.refinedstorage.apiimpl.API; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.items.ItemHandlerHelper; -import refinedstorage.api.storage.item.IItemStorage; -import refinedstorage.apiimpl.API; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/src/main/java/refinedstorage/apiimpl/util/Comparer.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/Comparer.java similarity index 96% rename from src/main/java/refinedstorage/apiimpl/util/Comparer.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/Comparer.java index c8db9d31b..bfe9c177a 100755 --- a/src/main/java/refinedstorage/apiimpl/util/Comparer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/Comparer.java @@ -1,10 +1,10 @@ -package refinedstorage.apiimpl.util; +package com.raoulvdberge.refinedstorage.apiimpl.util; +import com.raoulvdberge.refinedstorage.api.util.IComparer; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.ArrayUtils; -import refinedstorage.api.util.IComparer; public class Comparer implements IComparer { @Override diff --git a/src/main/java/refinedstorage/apiimpl/util/FluidStackList.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FluidStackList.java similarity index 93% rename from src/main/java/refinedstorage/apiimpl/util/FluidStackList.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FluidStackList.java index 68a02f5a2..7bbeb1d59 100755 --- a/src/main/java/refinedstorage/apiimpl/util/FluidStackList.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FluidStackList.java @@ -1,15 +1,14 @@ -package refinedstorage.apiimpl.util; +package com.raoulvdberge.refinedstorage.apiimpl.util; import com.google.common.collect.ArrayListMultimap; +import com.raoulvdberge.refinedstorage.api.util.IFluidStackList; +import com.raoulvdberge.refinedstorage.apiimpl.API; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import refinedstorage.api.util.IFluidStackList; -import refinedstorage.apiimpl.API; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Collection; -import java.util.stream.Collectors; public class FluidStackList implements IFluidStackList { private ArrayListMultimap stacks = ArrayListMultimap.create(); diff --git a/src/main/java/refinedstorage/apiimpl/util/ItemStackList.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackList.java similarity index 89% rename from src/main/java/refinedstorage/apiimpl/util/ItemStackList.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackList.java index 4157b2bb2..b4cbf5c30 100755 --- a/src/main/java/refinedstorage/apiimpl/util/ItemStackList.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackList.java @@ -1,11 +1,11 @@ -package refinedstorage.apiimpl.util; +package com.raoulvdberge.refinedstorage.apiimpl.util; import com.google.common.collect.ArrayListMultimap; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.api.util.IItemStackList; +import com.raoulvdberge.refinedstorage.apiimpl.API; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import refinedstorage.api.util.IComparer; -import refinedstorage.api.util.IItemStackList; -import refinedstorage.apiimpl.API; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -79,8 +79,8 @@ public class ItemStackList implements IItemStackList { @Override public void clean() { List toRemove = stacks.values().stream() - .filter(stack -> stack.stackSize <= 0) - .collect(Collectors.toList()); + .filter(stack -> stack.stackSize <= 0) + .collect(Collectors.toList()); toRemove.forEach(stack -> stacks.remove(stack.getItem(), stack)); } diff --git a/src/main/java/refinedstorage/block/BlockBase.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java similarity index 95% rename from src/main/java/refinedstorage/block/BlockBase.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java index 7acbbe385..997a52365 100755 --- a/src/main/java/refinedstorage/block/BlockBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java @@ -1,5 +1,8 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.item.ItemBlockBase; +import com.raoulvdberge.refinedstorage.tile.TileBase; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyDirection; @@ -15,9 +18,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; -import refinedstorage.RS; -import refinedstorage.item.ItemBlockBase; -import refinedstorage.tile.TileBase; public abstract class BlockBase extends Block { private static final PropertyDirection DIRECTION = PropertyDirection.create("direction"); diff --git a/src/main/java/refinedstorage/block/BlockCable.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java similarity index 96% rename from src/main/java/refinedstorage/block/BlockCable.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java index 920a97fba..d03f53c3f 100755 --- a/src/main/java/refinedstorage/block/BlockCable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java @@ -1,5 +1,12 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.api.network.INetworkNode; +import com.raoulvdberge.refinedstorage.tile.TileBase; +import com.raoulvdberge.refinedstorage.tile.TileCable; +import com.raoulvdberge.refinedstorage.tile.TileMultipartNode; +import com.raoulvdberge.refinedstorage.tile.TileNode; import mcmultipart.block.BlockCoverable; import mcmultipart.block.BlockMultipartContainer; import mcmultipart.raytrace.RayTraceUtils; @@ -22,13 +29,6 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; -import refinedstorage.RS; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.network.INetworkNode; -import refinedstorage.tile.TileBase; -import refinedstorage.tile.TileCable; -import refinedstorage.tile.TileMultipartNode; -import refinedstorage.tile.TileNode; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/refinedstorage/block/BlockConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java similarity index 94% rename from src/main/java/refinedstorage/block/BlockConstructor.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java index 6c5bfb9aa..93a45f6d8 100755 --- a/src/main/java/refinedstorage/block/BlockConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java @@ -1,5 +1,8 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.tile.TileConstructor; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -9,9 +12,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSGui; -import refinedstorage.tile.TileConstructor; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/refinedstorage/block/BlockController.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java similarity index 93% rename from src/main/java/refinedstorage/block/BlockController.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java index 3b8cf5a58..2e8e0ba1b 100755 --- a/src/main/java/refinedstorage/block/BlockController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java @@ -1,5 +1,10 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.item.ItemBlockController; +import com.raoulvdberge.refinedstorage.tile.TileController; import net.minecraft.block.Block; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyInteger; @@ -17,11 +22,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSBlocks; -import refinedstorage.RSGui; -import refinedstorage.item.ItemBlockController; -import refinedstorage.tile.TileController; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/refinedstorage/block/BlockCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java similarity index 85% rename from src/main/java/refinedstorage/block/BlockCrafter.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java index 3c8741265..a0da0514f 100755 --- a/src/main/java/refinedstorage/block/BlockCrafter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java @@ -1,5 +1,8 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.tile.TileCrafter; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -8,9 +11,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSGui; -import refinedstorage.tile.TileCrafter; public class BlockCrafter extends BlockNode { public BlockCrafter() { diff --git a/src/main/java/refinedstorage/block/BlockCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCraftingMonitor.java similarity index 84% rename from src/main/java/refinedstorage/block/BlockCraftingMonitor.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockCraftingMonitor.java index 382169cbe..13d49b95d 100755 --- a/src/main/java/refinedstorage/block/BlockCraftingMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCraftingMonitor.java @@ -1,5 +1,8 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.tile.TileCraftingMonitor; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -8,9 +11,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSGui; -import refinedstorage.tile.TileCraftingMonitor; public class BlockCraftingMonitor extends BlockNode { public BlockCraftingMonitor() { diff --git a/src/main/java/refinedstorage/block/BlockDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java similarity index 86% rename from src/main/java/refinedstorage/block/BlockDestructor.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java index 432f3d94d..f333996d7 100755 --- a/src/main/java/refinedstorage/block/BlockDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java @@ -1,5 +1,9 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.tile.TileDestructor; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -9,10 +13,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSBlocks; -import refinedstorage.RSGui; -import refinedstorage.tile.TileDestructor; import java.util.List; diff --git a/src/main/java/refinedstorage/block/BlockDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java similarity index 93% rename from src/main/java/refinedstorage/block/BlockDetector.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java index 3de740e81..e0a740f43 100755 --- a/src/main/java/refinedstorage/block/BlockDetector.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java @@ -1,5 +1,8 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.tile.TileDetector; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -13,9 +16,6 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSGui; -import refinedstorage.tile.TileDetector; public class BlockDetector extends BlockNode { private static final AxisAlignedBB AABB_DETECTOR = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 5D / 16D, 1.0D); diff --git a/src/main/java/refinedstorage/block/BlockDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskDrive.java similarity index 85% rename from src/main/java/refinedstorage/block/BlockDiskDrive.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskDrive.java index 6b00d9bc0..85839f337 100755 --- a/src/main/java/refinedstorage/block/BlockDiskDrive.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskDrive.java @@ -1,5 +1,8 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.tile.TileDiskDrive; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -8,9 +11,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSGui; -import refinedstorage.tile.TileDiskDrive; public class BlockDiskDrive extends BlockNode { public BlockDiskDrive() { diff --git a/src/main/java/refinedstorage/block/BlockDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java similarity index 87% rename from src/main/java/refinedstorage/block/BlockDiskManipulator.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java index 3e464576b..45b8d6ac4 100755 --- a/src/main/java/refinedstorage/block/BlockDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java @@ -1,5 +1,8 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.tile.TileDiskManipulator; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -8,9 +11,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSGui; -import refinedstorage.tile.TileDiskManipulator; import javax.annotation.Nullable; diff --git a/src/main/java/refinedstorage/block/BlockExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java similarity index 95% rename from src/main/java/refinedstorage/block/BlockExporter.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java index 83c873eaf..41a61c44d 100755 --- a/src/main/java/refinedstorage/block/BlockExporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java @@ -1,5 +1,8 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.tile.TileExporter; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -9,9 +12,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSGui; -import refinedstorage.tile.TileExporter; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/refinedstorage/block/BlockExternalStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java similarity index 94% rename from src/main/java/refinedstorage/block/BlockExternalStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java index 62fbfcede..e63accaf6 100755 --- a/src/main/java/refinedstorage/block/BlockExternalStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java @@ -1,5 +1,8 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.tile.externalstorage.TileExternalStorage; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -10,9 +13,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSGui; -import refinedstorage.tile.externalstorage.TileExternalStorage; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/refinedstorage/block/BlockFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidInterface.java similarity index 85% rename from src/main/java/refinedstorage/block/BlockFluidInterface.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidInterface.java index 2a923eec6..855c175fd 100755 --- a/src/main/java/refinedstorage/block/BlockFluidInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidInterface.java @@ -1,5 +1,8 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.tile.TileFluidInterface; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -8,9 +11,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSGui; -import refinedstorage.tile.TileFluidInterface; public class BlockFluidInterface extends BlockNode { public BlockFluidInterface() { diff --git a/src/main/java/refinedstorage/block/BlockFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java similarity index 91% rename from src/main/java/refinedstorage/block/BlockFluidStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java index 9ba6625b5..4e5ba621b 100755 --- a/src/main/java/refinedstorage/block/BlockFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java @@ -1,5 +1,10 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.item.ItemBlockFluidStorage; +import com.raoulvdberge.refinedstorage.tile.TileFluidStorage; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -15,11 +20,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSBlocks; -import refinedstorage.RSGui; -import refinedstorage.item.ItemBlockFluidStorage; -import refinedstorage.tile.TileFluidStorage; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/refinedstorage/block/BlockGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java similarity index 90% rename from src/main/java/refinedstorage/block/BlockGrid.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java index 53a9b92d6..eb7c3f76c 100755 --- a/src/main/java/refinedstorage/block/BlockGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java @@ -1,5 +1,9 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.item.ItemBlockBase; +import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -12,10 +16,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSGui; -import refinedstorage.item.ItemBlockBase; -import refinedstorage.tile.grid.TileGrid; import java.util.List; diff --git a/src/main/java/refinedstorage/block/BlockImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java similarity index 95% rename from src/main/java/refinedstorage/block/BlockImporter.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java index e06e62761..c39e1d39d 100755 --- a/src/main/java/refinedstorage/block/BlockImporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java @@ -1,5 +1,8 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.tile.TileImporter; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -9,9 +12,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSGui; -import refinedstorage.tile.TileImporter; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/refinedstorage/block/BlockInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockInterface.java similarity index 85% rename from src/main/java/refinedstorage/block/BlockInterface.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockInterface.java index 7c625e937..8d93fb3d9 100755 --- a/src/main/java/refinedstorage/block/BlockInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockInterface.java @@ -1,43 +1,43 @@ -package refinedstorage.block; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSGui; -import refinedstorage.tile.TileInterface; - -public class BlockInterface extends BlockNode { - public BlockInterface() { - super("interface"); - } - - @Override - public TileEntity createTileEntity(World world, IBlockState state) { - return new TileInterface(); - } - - @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { - if (!world.isRemote) { - player.openGui(RS.INSTANCE, RSGui.INTERFACE, world, pos.getX(), pos.getY(), pos.getZ()); - } - - return true; - } - - @Override - public boolean hasConnectivityState() { - return true; - } - - @Override - public EnumPlacementType getPlacementType() { - return null; - } -} +package com.raoulvdberge.refinedstorage.block; + +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.tile.TileInterface; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class BlockInterface extends BlockNode { + public BlockInterface() { + super("interface"); + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileInterface(); + } + + @Override + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + if (!world.isRemote) { + player.openGui(RS.INSTANCE, RSGui.INTERFACE, world, pos.getX(), pos.getY(), pos.getZ()); + } + + return true; + } + + @Override + public boolean hasConnectivityState() { + return true; + } + + @Override + public EnumPlacementType getPlacementType() { + return null; + } +} diff --git a/src/main/java/refinedstorage/block/BlockMachineCasing.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockMachineCasing.java similarity index 82% rename from src/main/java/refinedstorage/block/BlockMachineCasing.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockMachineCasing.java index ecce72c97..ff56689b4 100755 --- a/src/main/java/refinedstorage/block/BlockMachineCasing.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockMachineCasing.java @@ -1,4 +1,4 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; public class BlockMachineCasing extends BlockBase { public BlockMachineCasing() { diff --git a/src/main/java/refinedstorage/block/BlockNetworkReceiver.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java similarity index 83% rename from src/main/java/refinedstorage/block/BlockNetworkReceiver.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java index 64b17b618..24b947de4 100755 --- a/src/main/java/refinedstorage/block/BlockNetworkReceiver.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java @@ -1,9 +1,9 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.tile.TileNetworkReceiver; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import refinedstorage.tile.TileNetworkReceiver; public class BlockNetworkReceiver extends BlockNode { public BlockNetworkReceiver() { diff --git a/src/main/java/refinedstorage/block/BlockNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java similarity index 85% rename from src/main/java/refinedstorage/block/BlockNetworkTransmitter.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java index 1340830f0..99caf917f 100755 --- a/src/main/java/refinedstorage/block/BlockNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java @@ -1,5 +1,8 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.tile.TileNetworkTransmitter; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -8,9 +11,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSGui; -import refinedstorage.tile.TileNetworkTransmitter; public class BlockNetworkTransmitter extends BlockNode { public BlockNetworkTransmitter() { diff --git a/src/main/java/refinedstorage/block/BlockNode.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java similarity index 94% rename from src/main/java/refinedstorage/block/BlockNode.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java index 69191c25f..971f58d83 100755 --- a/src/main/java/refinedstorage/block/BlockNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java @@ -1,5 +1,7 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.tile.TileNode; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -10,8 +12,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.tile.TileNode; public abstract class BlockNode extends BlockBase { private static final PropertyBool CONNECTED = PropertyBool.create("connected"); diff --git a/src/main/java/refinedstorage/block/BlockProcessingPatternEncoder.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockProcessingPatternEncoder.java similarity index 89% rename from src/main/java/refinedstorage/block/BlockProcessingPatternEncoder.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockProcessingPatternEncoder.java index 824c1c3e7..c61a51f30 100755 --- a/src/main/java/refinedstorage/block/BlockProcessingPatternEncoder.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockProcessingPatternEncoder.java @@ -1,5 +1,8 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.tile.TileProcessingPatternEncoder; import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; @@ -10,9 +13,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSGui; -import refinedstorage.tile.TileProcessingPatternEncoder; import java.util.List; diff --git a/src/main/java/refinedstorage/block/BlockRelay.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java similarity index 85% rename from src/main/java/refinedstorage/block/BlockRelay.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java index 9e1dc6304..04d1e97e5 100755 --- a/src/main/java/refinedstorage/block/BlockRelay.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java @@ -1,42 +1,42 @@ -package refinedstorage.block; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSGui; -import refinedstorage.tile.TileRelay; - -public class BlockRelay extends BlockNode { - public BlockRelay() { - super("relay"); - } - - @Override - public TileEntity createTileEntity(World world, IBlockState state) { - return new TileRelay(); - } - - @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { - if (!world.isRemote) { - player.openGui(RS.INSTANCE, RSGui.RELAY, world, pos.getX(), pos.getY(), pos.getZ()); - } - - return true; - } - - @Override - public EnumPlacementType getPlacementType() { - return null; - } - - public boolean hasConnectivityState() { - return true; - } -} +package com.raoulvdberge.refinedstorage.block; + +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.tile.TileRelay; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class BlockRelay extends BlockNode { + public BlockRelay() { + super("relay"); + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileRelay(); + } + + @Override + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + if (!world.isRemote) { + player.openGui(RS.INSTANCE, RSGui.RELAY, world, pos.getX(), pos.getY(), pos.getZ()); + } + + return true; + } + + @Override + public EnumPlacementType getPlacementType() { + return null; + } + + public boolean hasConnectivityState() { + return true; + } +} diff --git a/src/main/java/refinedstorage/block/BlockSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java similarity index 90% rename from src/main/java/refinedstorage/block/BlockSolderer.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java index b6209ffb5..f139a6d1e 100755 --- a/src/main/java/refinedstorage/block/BlockSolderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java @@ -1,5 +1,8 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.tile.TileSolderer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; @@ -10,9 +13,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSGui; -import refinedstorage.tile.TileSolderer; import java.util.List; diff --git a/src/main/java/refinedstorage/block/BlockStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java similarity index 91% rename from src/main/java/refinedstorage/block/BlockStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java index 012010539..47666f5e2 100755 --- a/src/main/java/refinedstorage/block/BlockStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java @@ -1,114 +1,114 @@ -package refinedstorage.block; - -import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSBlocks; -import refinedstorage.RSGui; -import refinedstorage.item.ItemBlockStorage; -import refinedstorage.tile.TileStorage; - -import java.util.ArrayList; -import java.util.List; - -public class BlockStorage extends BlockNode { - public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumItemStorageType.class); - - public BlockStorage() { - super("storage"); - - setHardness(5.8F); - } - - @Override - public void getSubBlocks(Item item, CreativeTabs tab, List subItems) { - for (int i = 0; i <= 4; ++i) { - subItems.add(ItemBlockStorage.initNBT(new ItemStack(item, 1, i))); - } - } - - @Override - protected BlockStateContainer createBlockState() { - return createBlockStateBuilder() - .add(TYPE) - .build(); - } - - @Override - public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(TYPE, EnumItemStorageType.getById(meta)); - } - - @Override - public int getMetaFromState(IBlockState state) { - return ((EnumItemStorageType) state.getValue(TYPE)).getId(); - } - - @Override - public TileEntity createTileEntity(World world, IBlockState state) { - return new TileStorage(); - } - - @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { - if (!world.isRemote) { - player.openGui(RS.INSTANCE, RSGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ()); - } - - return true; - } - - @Override - public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack) { - super.onBlockPlacedBy(world, pos, state, player, stack); - - if (!world.isRemote && stack.hasTagCompound() && stack.getTagCompound().hasKey(TileStorage.NBT_STORAGE)) { - ((TileStorage) world.getTileEntity(pos)).setStorageTag(stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE)); - } - } - - @Override - public void breakBlock(World world, BlockPos pos, IBlockState state) { - ((TileStorage) world.getTileEntity(pos)).onBreak(); - - super.breakBlock(world, pos, state); - } - - @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - TileStorage storage = (TileStorage) world.getTileEntity(pos); - - List drops = new ArrayList<>(); - - ItemStack stack = new ItemStack(RSBlocks.STORAGE, 1, getMetaFromState(state)); - stack.setTagCompound(new NBTTagCompound()); - stack.getTagCompound().setTag(TileStorage.NBT_STORAGE, storage.getStorageTag()); - - drops.add(stack); - - return drops; - } - - @Override - public Item createItem() { - return new ItemBlockStorage(); - } - - @Override - public EnumPlacementType getPlacementType() { - return null; - } -} +package com.raoulvdberge.refinedstorage.block; + +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.item.ItemBlockStorage; +import com.raoulvdberge.refinedstorage.tile.TileStorage; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.state.IBlockState; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import java.util.ArrayList; +import java.util.List; + +public class BlockStorage extends BlockNode { + public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumItemStorageType.class); + + public BlockStorage() { + super("storage"); + + setHardness(5.8F); + } + + @Override + public void getSubBlocks(Item item, CreativeTabs tab, List subItems) { + for (int i = 0; i <= 4; ++i) { + subItems.add(ItemBlockStorage.initNBT(new ItemStack(item, 1, i))); + } + } + + @Override + protected BlockStateContainer createBlockState() { + return createBlockStateBuilder() + .add(TYPE) + .build(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(TYPE, EnumItemStorageType.getById(meta)); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumItemStorageType) state.getValue(TYPE)).getId(); + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileStorage(); + } + + @Override + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + if (!world.isRemote) { + player.openGui(RS.INSTANCE, RSGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ()); + } + + return true; + } + + @Override + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack) { + super.onBlockPlacedBy(world, pos, state, player, stack); + + if (!world.isRemote && stack.hasTagCompound() && stack.getTagCompound().hasKey(TileStorage.NBT_STORAGE)) { + ((TileStorage) world.getTileEntity(pos)).setStorageTag(stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE)); + } + } + + @Override + public void breakBlock(World world, BlockPos pos, IBlockState state) { + ((TileStorage) world.getTileEntity(pos)).onBreak(); + + super.breakBlock(world, pos, state); + } + + @Override + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + TileStorage storage = (TileStorage) world.getTileEntity(pos); + + List drops = new ArrayList<>(); + + ItemStack stack = new ItemStack(RSBlocks.STORAGE, 1, getMetaFromState(state)); + stack.setTagCompound(new NBTTagCompound()); + stack.getTagCompound().setTag(TileStorage.NBT_STORAGE, storage.getStorageTag()); + + drops.add(stack); + + return drops; + } + + @Override + public Item createItem() { + return new ItemBlockStorage(); + } + + @Override + public EnumPlacementType getPlacementType() { + return null; + } +} diff --git a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java similarity index 93% rename from src/main/java/refinedstorage/block/BlockWirelessTransmitter.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java index 3c90d6461..c39fbee50 100755 --- a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java @@ -1,5 +1,8 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.tile.TileWirelessTransmitter; import mcmultipart.block.BlockCoverable; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -15,9 +18,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSGui; -import refinedstorage.tile.TileWirelessTransmitter; import java.util.List; diff --git a/src/main/java/refinedstorage/block/EnumControllerType.java b/src/main/java/com/raoulvdberge/refinedstorage/block/EnumControllerType.java similarity index 91% rename from src/main/java/refinedstorage/block/EnumControllerType.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/EnumControllerType.java index 7959bfe41..509898cd0 100755 --- a/src/main/java/refinedstorage/block/EnumControllerType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/EnumControllerType.java @@ -1,4 +1,4 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/refinedstorage/block/EnumFluidStorageType.java b/src/main/java/com/raoulvdberge/refinedstorage/block/EnumFluidStorageType.java similarity index 95% rename from src/main/java/refinedstorage/block/EnumFluidStorageType.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/EnumFluidStorageType.java index abe6a8d88..dc80d4617 100755 --- a/src/main/java/refinedstorage/block/EnumFluidStorageType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/EnumFluidStorageType.java @@ -1,4 +1,4 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/refinedstorage/block/EnumGridType.java b/src/main/java/com/raoulvdberge/refinedstorage/block/EnumGridType.java similarity index 92% rename from src/main/java/refinedstorage/block/EnumGridType.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/EnumGridType.java index 8c0293ae5..a53b9e565 100755 --- a/src/main/java/refinedstorage/block/EnumGridType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/EnumGridType.java @@ -1,4 +1,4 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/refinedstorage/block/EnumItemStorageType.java b/src/main/java/com/raoulvdberge/refinedstorage/block/EnumItemStorageType.java similarity index 95% rename from src/main/java/refinedstorage/block/EnumItemStorageType.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/EnumItemStorageType.java index 7c8b2b00f..4de1cbff4 100755 --- a/src/main/java/refinedstorage/block/EnumItemStorageType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/EnumItemStorageType.java @@ -1,4 +1,4 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/refinedstorage/block/EnumPlacementType.java b/src/main/java/com/raoulvdberge/refinedstorage/block/EnumPlacementType.java similarity index 96% rename from src/main/java/refinedstorage/block/EnumPlacementType.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/EnumPlacementType.java index 72f9fbc13..d983fdfcb 100755 --- a/src/main/java/refinedstorage/block/EnumPlacementType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/EnumPlacementType.java @@ -1,4 +1,4 @@ -package refinedstorage.block; +package com.raoulvdberge.refinedstorage.block; import net.minecraft.block.BlockPistonBase; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/refinedstorage/container/ContainerBase.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java similarity index 93% rename from src/main/java/refinedstorage/container/ContainerBase.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java index 4a60adba3..baea73fd7 100755 --- a/src/main/java/refinedstorage/container/ContainerBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java @@ -1,147 +1,147 @@ -package refinedstorage.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ClickType; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraftforge.items.ItemHandlerHelper; -import refinedstorage.apiimpl.API; -import refinedstorage.container.slot.*; -import refinedstorage.tile.TileBase; -import refinedstorage.tile.grid.WirelessGrid; - -public abstract class ContainerBase extends Container { - private TileBase tile; - private EntityPlayer player; - - public ContainerBase(TileBase tile, EntityPlayer player) { - this.tile = tile; - this.player = player; - } - - public EntityPlayer getPlayer() { - return player; - } - - public TileBase getTile() { - return tile; - } - - protected void addPlayerInventory(int xInventory, int yInventory) { - int id = 0; - - for (int i = 0; i < 9; i++) { - int x = xInventory + i * 18; - int y = yInventory + 4 + (3 * 18); - - if (i == player.inventory.currentItem && (ContainerBase.this instanceof ContainerGridFilter || (ContainerBase.this instanceof ContainerGrid && ((ContainerGrid) ContainerBase.this).getGrid() instanceof WirelessGrid))) { - addSlotToContainer(new SlotDisabled(player.inventory, id, x, y)); - } else { - addSlotToContainer(new Slot(player.inventory, id, x, y)); - } - - id++; - } - - for (int y = 0; y < 3; y++) { - for (int x = 0; x < 9; x++) { - addSlotToContainer(new Slot(player.inventory, id, xInventory + x * 18, yInventory + y * 18)); - - id++; - } - } - } - - @Override - public ItemStack slotClick(int id, int clickedButton, ClickType clickType, EntityPlayer player) { - Slot slot = id >= 0 ? getSlot(id) : null; - - if (slot instanceof SlotSpecimen) { - if (((SlotSpecimen) slot).isWithSize()) { - if (slot.getStack() != null) { - if (clickType == ClickType.QUICK_MOVE) { - slot.putStack(null); - } else { - int amount = slot.getStack().stackSize; - - if (clickedButton == 0) { - amount = Math.max(1, amount - 1); - } else if (clickedButton == 1) { - amount = Math.min(64, amount + 1); - } - - slot.getStack().stackSize = amount; - } - } else if (player.inventory.getItemStack() != null) { - int amount = player.inventory.getItemStack().stackSize; - - slot.putStack(ItemHandlerHelper.copyStackWithSize(player.inventory.getItemStack(), clickedButton == 1 ? 1 : amount)); - } - } else if (player.inventory.getItemStack() == null) { - slot.putStack(null); - } else if (slot.isItemValid(player.inventory.getItemStack())) { - slot.putStack(player.inventory.getItemStack().copy()); - } - - return player.inventory.getItemStack(); - } else if (slot instanceof SlotSpecimenLegacy) { - if (player.inventory.getItemStack() == null) { - slot.putStack(null); - } else if (slot.isItemValid(player.inventory.getItemStack())) { - slot.putStack(player.inventory.getItemStack().copy()); - } - - return player.inventory.getItemStack(); - } else if (slot instanceof SlotDisabled) { - return null; - } - - return super.slotClick(id, clickedButton, clickType, player); - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) { - return null; - } - - protected ItemStack mergeItemStackToSpecimen(ItemStack stack, int begin, int end) { - for (int i = begin; i < end; ++i) { - if (API.instance().getComparer().isEqualNoQuantity(getStackFromSlot(getSlot(i)), stack)) { - return null; - } - } - - for (int i = begin; i < end; ++i) { - Slot slot = getSlot(i); - - if (getStackFromSlot(slot) == null && slot.isItemValid(stack)) { - slot.putStack(ItemHandlerHelper.copyStackWithSize(stack, 1)); - slot.onSlotChanged(); - - return null; - } - } - - return null; - } - - private ItemStack getStackFromSlot(Slot slot) { - ItemStack stackInSlot = slot.getStack(); - - if (stackInSlot == null) { - if (slot instanceof SlotSpecimenFluid) { - stackInSlot = ((SlotSpecimenFluid) slot).getRealStack(); - } else if (slot instanceof SlotSpecimenType) { - stackInSlot = ((SlotSpecimenType) slot).getRealStack(); - } - } - - return stackInSlot; - } - - @Override - public boolean canInteractWith(EntityPlayer player) { - return true; - } -} +package com.raoulvdberge.refinedstorage.container; + +import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.container.slot.*; +import com.raoulvdberge.refinedstorage.tile.TileBase; +import com.raoulvdberge.refinedstorage.tile.grid.WirelessGrid; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ClickType; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraftforge.items.ItemHandlerHelper; + +public abstract class ContainerBase extends Container { + private TileBase tile; + private EntityPlayer player; + + public ContainerBase(TileBase tile, EntityPlayer player) { + this.tile = tile; + this.player = player; + } + + public EntityPlayer getPlayer() { + return player; + } + + public TileBase getTile() { + return tile; + } + + protected void addPlayerInventory(int xInventory, int yInventory) { + int id = 0; + + for (int i = 0; i < 9; i++) { + int x = xInventory + i * 18; + int y = yInventory + 4 + (3 * 18); + + if (i == player.inventory.currentItem && (ContainerBase.this instanceof ContainerGridFilter || (ContainerBase.this instanceof ContainerGrid && ((ContainerGrid) ContainerBase.this).getGrid() instanceof WirelessGrid))) { + addSlotToContainer(new SlotDisabled(player.inventory, id, x, y)); + } else { + addSlotToContainer(new Slot(player.inventory, id, x, y)); + } + + id++; + } + + for (int y = 0; y < 3; y++) { + for (int x = 0; x < 9; x++) { + addSlotToContainer(new Slot(player.inventory, id, xInventory + x * 18, yInventory + y * 18)); + + id++; + } + } + } + + @Override + public ItemStack slotClick(int id, int clickedButton, ClickType clickType, EntityPlayer player) { + Slot slot = id >= 0 ? getSlot(id) : null; + + if (slot instanceof SlotSpecimen) { + if (((SlotSpecimen) slot).isWithSize()) { + if (slot.getStack() != null) { + if (clickType == ClickType.QUICK_MOVE) { + slot.putStack(null); + } else { + int amount = slot.getStack().stackSize; + + if (clickedButton == 0) { + amount = Math.max(1, amount - 1); + } else if (clickedButton == 1) { + amount = Math.min(64, amount + 1); + } + + slot.getStack().stackSize = amount; + } + } else if (player.inventory.getItemStack() != null) { + int amount = player.inventory.getItemStack().stackSize; + + slot.putStack(ItemHandlerHelper.copyStackWithSize(player.inventory.getItemStack(), clickedButton == 1 ? 1 : amount)); + } + } else if (player.inventory.getItemStack() == null) { + slot.putStack(null); + } else if (slot.isItemValid(player.inventory.getItemStack())) { + slot.putStack(player.inventory.getItemStack().copy()); + } + + return player.inventory.getItemStack(); + } else if (slot instanceof SlotSpecimenLegacy) { + if (player.inventory.getItemStack() == null) { + slot.putStack(null); + } else if (slot.isItemValid(player.inventory.getItemStack())) { + slot.putStack(player.inventory.getItemStack().copy()); + } + + return player.inventory.getItemStack(); + } else if (slot instanceof SlotDisabled) { + return null; + } + + return super.slotClick(id, clickedButton, clickType, player); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) { + return null; + } + + protected ItemStack mergeItemStackToSpecimen(ItemStack stack, int begin, int end) { + for (int i = begin; i < end; ++i) { + if (API.instance().getComparer().isEqualNoQuantity(getStackFromSlot(getSlot(i)), stack)) { + return null; + } + } + + for (int i = begin; i < end; ++i) { + Slot slot = getSlot(i); + + if (getStackFromSlot(slot) == null && slot.isItemValid(stack)) { + slot.putStack(ItemHandlerHelper.copyStackWithSize(stack, 1)); + slot.onSlotChanged(); + + return null; + } + } + + return null; + } + + private ItemStack getStackFromSlot(Slot slot) { + ItemStack stackInSlot = slot.getStack(); + + if (stackInSlot == null) { + if (slot instanceof SlotSpecimenFluid) { + stackInSlot = ((SlotSpecimenFluid) slot).getRealStack(); + } else if (slot instanceof SlotSpecimenType) { + stackInSlot = ((SlotSpecimenType) slot).getRealStack(); + } + } + + return stackInSlot; + } + + @Override + public boolean canInteractWith(EntityPlayer player) { + return true; + } +} diff --git a/src/main/java/refinedstorage/container/ContainerConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerConstructor.java similarity index 88% rename from src/main/java/refinedstorage/container/ContainerConstructor.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerConstructor.java index e3fcf0853..4ab6f0a80 100755 --- a/src/main/java/refinedstorage/container/ContainerConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerConstructor.java @@ -1,49 +1,49 @@ -package refinedstorage.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraftforge.items.SlotItemHandler; -import refinedstorage.container.slot.SlotSpecimenType; -import refinedstorage.tile.TileConstructor; - -public class ContainerConstructor extends ContainerBase { - public ContainerConstructor(TileConstructor constructor, EntityPlayer player) { - super(constructor, player); - - for (int i = 0; i < 4; ++i) { - addSlotToContainer(new SlotItemHandler(constructor.getUpgrades(), i, 187, 6 + (i * 18))); - } - - addSlotToContainer(new SlotSpecimenType(constructor, 0, 80, 20)); - - addPlayerInventory(8, 55); - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int index) { - ItemStack stack = null; - - Slot slot = getSlot(index); - - if (slot != null && slot.getHasStack()) { - stack = slot.getStack(); - - if (index < 4) { - if (!mergeItemStack(stack, 4, inventorySlots.size(), false)) { - return null; - } - } else if (!mergeItemStack(stack, 0, 4, false)) { - return mergeItemStackToSpecimen(stack, 4, 4 + 1); - } - - if (stack.stackSize == 0) { - slot.putStack(null); - } else { - slot.onSlotChanged(); - } - } - - return stack; - } -} +package com.raoulvdberge.refinedstorage.container; + +import com.raoulvdberge.refinedstorage.container.slot.SlotSpecimenType; +import com.raoulvdberge.refinedstorage.tile.TileConstructor; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraftforge.items.SlotItemHandler; + +public class ContainerConstructor extends ContainerBase { + public ContainerConstructor(TileConstructor constructor, EntityPlayer player) { + super(constructor, player); + + for (int i = 0; i < 4; ++i) { + addSlotToContainer(new SlotItemHandler(constructor.getUpgrades(), i, 187, 6 + (i * 18))); + } + + addSlotToContainer(new SlotSpecimenType(constructor, 0, 80, 20)); + + addPlayerInventory(8, 55); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + ItemStack stack = null; + + Slot slot = getSlot(index); + + if (slot != null && slot.getHasStack()) { + stack = slot.getStack(); + + if (index < 4) { + if (!mergeItemStack(stack, 4, inventorySlots.size(), false)) { + return null; + } + } else if (!mergeItemStack(stack, 0, 4, false)) { + return mergeItemStackToSpecimen(stack, 4, 4 + 1); + } + + if (stack.stackSize == 0) { + slot.putStack(null); + } else { + slot.onSlotChanged(); + } + } + + return stack; + } +} diff --git a/src/main/java/refinedstorage/container/ContainerController.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerController.java similarity index 70% rename from src/main/java/refinedstorage/container/ContainerController.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerController.java index e3595e993..c1477a840 100755 --- a/src/main/java/refinedstorage/container/ContainerController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerController.java @@ -1,12 +1,12 @@ -package refinedstorage.container; - -import net.minecraft.entity.player.EntityPlayer; -import refinedstorage.tile.TileController; - -public class ContainerController extends ContainerBase { - public ContainerController(TileController controller, EntityPlayer player) { - super(controller, player); - - addPlayerInventory(8, 99); - } -} +package com.raoulvdberge.refinedstorage.container; + +import com.raoulvdberge.refinedstorage.tile.TileController; +import net.minecraft.entity.player.EntityPlayer; + +public class ContainerController extends ContainerBase { + public ContainerController(TileController controller, EntityPlayer player) { + super(controller, player); + + addPlayerInventory(8, 99); + } +} diff --git a/src/main/java/refinedstorage/container/ContainerCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafter.java similarity index 92% rename from src/main/java/refinedstorage/container/ContainerCrafter.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafter.java index 46354df4c..63c66c9c8 100755 --- a/src/main/java/refinedstorage/container/ContainerCrafter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafter.java @@ -1,10 +1,10 @@ -package refinedstorage.container; +package com.raoulvdberge.refinedstorage.container; +import com.raoulvdberge.refinedstorage.tile.TileCrafter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.items.SlotItemHandler; -import refinedstorage.tile.TileCrafter; public class ContainerCrafter extends ContainerBase { public ContainerCrafter(TileCrafter crafter, EntityPlayer player) { diff --git a/src/main/java/refinedstorage/container/ContainerCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingMonitor.java similarity index 71% rename from src/main/java/refinedstorage/container/ContainerCraftingMonitor.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingMonitor.java index e49888b50..3ff74a117 100755 --- a/src/main/java/refinedstorage/container/ContainerCraftingMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingMonitor.java @@ -1,7 +1,7 @@ -package refinedstorage.container; +package com.raoulvdberge.refinedstorage.container; +import com.raoulvdberge.refinedstorage.tile.TileCraftingMonitor; import net.minecraft.entity.player.EntityPlayer; -import refinedstorage.tile.TileCraftingMonitor; public class ContainerCraftingMonitor extends ContainerBase { public ContainerCraftingMonitor(TileCraftingMonitor craftingMonitor, EntityPlayer player) { diff --git a/src/main/java/refinedstorage/container/ContainerCraftingSettings.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingSettings.java similarity index 95% rename from src/main/java/refinedstorage/container/ContainerCraftingSettings.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingSettings.java index ff39fff7a..c7c50bfc3 100755 --- a/src/main/java/refinedstorage/container/ContainerCraftingSettings.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingSettings.java @@ -1,11 +1,11 @@ -package refinedstorage.container; +package com.raoulvdberge.refinedstorage.container; +import com.raoulvdberge.refinedstorage.container.slot.SlotDisabled; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.items.ItemHandlerHelper; -import refinedstorage.container.slot.SlotDisabled; import javax.annotation.Nullable; diff --git a/src/main/java/refinedstorage/container/ContainerDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDestructor.java similarity index 85% rename from src/main/java/refinedstorage/container/ContainerDestructor.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDestructor.java index b56f1ff86..f5874efff 100755 --- a/src/main/java/refinedstorage/container/ContainerDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDestructor.java @@ -1,52 +1,52 @@ -package refinedstorage.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraftforge.items.SlotItemHandler; -import refinedstorage.container.slot.SlotSpecimen; -import refinedstorage.container.slot.SlotSpecimenType; -import refinedstorage.tile.TileDestructor; - -public class ContainerDestructor extends ContainerBase { - public ContainerDestructor(TileDestructor destructor, EntityPlayer player) { - super(destructor, player); - - for (int i = 0; i < 4; ++i) { - addSlotToContainer(new SlotItemHandler(destructor.getUpgrades(), i, 187, 6 + (i * 18))); - } - - for (int i = 0; i < 9; ++i) { - addSlotToContainer(new SlotSpecimenType(destructor, i, 8 + (18 * i), 20, SlotSpecimen.SPECIMEN_BLOCK)); - } - - addPlayerInventory(8, 55); - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int index) { - ItemStack stack = null; - - Slot slot = getSlot(index); - - if (slot != null && slot.getHasStack()) { - stack = slot.getStack(); - - if (index < 4) { - if (!mergeItemStack(stack, 4 + 9, inventorySlots.size(), false)) { - return null; - } - } else if (!mergeItemStack(stack, 0, 4, false)) { - return mergeItemStackToSpecimen(stack, 4, 4 + 9); - } - - if (stack.stackSize == 0) { - slot.putStack(null); - } else { - slot.onSlotChanged(); - } - } - - return stack; - } -} +package com.raoulvdberge.refinedstorage.container; + +import com.raoulvdberge.refinedstorage.container.slot.SlotSpecimen; +import com.raoulvdberge.refinedstorage.container.slot.SlotSpecimenType; +import com.raoulvdberge.refinedstorage.tile.TileDestructor; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraftforge.items.SlotItemHandler; + +public class ContainerDestructor extends ContainerBase { + public ContainerDestructor(TileDestructor destructor, EntityPlayer player) { + super(destructor, player); + + for (int i = 0; i < 4; ++i) { + addSlotToContainer(new SlotItemHandler(destructor.getUpgrades(), i, 187, 6 + (i * 18))); + } + + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new SlotSpecimenType(destructor, i, 8 + (18 * i), 20, SlotSpecimen.SPECIMEN_BLOCK)); + } + + addPlayerInventory(8, 55); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + ItemStack stack = null; + + Slot slot = getSlot(index); + + if (slot != null && slot.getHasStack()) { + stack = slot.getStack(); + + if (index < 4) { + if (!mergeItemStack(stack, 4 + 9, inventorySlots.size(), false)) { + return null; + } + } else if (!mergeItemStack(stack, 0, 4, false)) { + return mergeItemStackToSpecimen(stack, 4, 4 + 9); + } + + if (stack.stackSize == 0) { + slot.putStack(null); + } else { + slot.onSlotChanged(); + } + } + + return stack; + } +} diff --git a/src/main/java/refinedstorage/container/ContainerDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDetector.java similarity index 79% rename from src/main/java/refinedstorage/container/ContainerDetector.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDetector.java index 555131202..b5763cc8a 100755 --- a/src/main/java/refinedstorage/container/ContainerDetector.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDetector.java @@ -1,28 +1,28 @@ -package refinedstorage.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import refinedstorage.container.slot.SlotSpecimenType; -import refinedstorage.tile.TileDetector; - -public class ContainerDetector extends ContainerBase { - public ContainerDetector(TileDetector detector, EntityPlayer player) { - super(detector, player); - - addSlotToContainer(new SlotSpecimenType(detector, 0, 107, 20)); - - addPlayerInventory(8, 55); - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int index) { - Slot slot = getSlot(index); - - if (slot != null && slot.getHasStack() && index > 0) { - return mergeItemStackToSpecimen(slot.getStack(), 0, 1); - } - - return null; - } -} +package com.raoulvdberge.refinedstorage.container; + +import com.raoulvdberge.refinedstorage.container.slot.SlotSpecimenType; +import com.raoulvdberge.refinedstorage.tile.TileDetector; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class ContainerDetector extends ContainerBase { + public ContainerDetector(TileDetector detector, EntityPlayer player) { + super(detector, player); + + addSlotToContainer(new SlotSpecimenType(detector, 0, 107, 20)); + + addPlayerInventory(8, 55); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + Slot slot = getSlot(index); + + if (slot != null && slot.getHasStack() && index > 0) { + return mergeItemStackToSpecimen(slot.getStack(), 0, 1); + } + + return null; + } +} diff --git a/src/main/java/refinedstorage/container/ContainerDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskDrive.java similarity index 89% rename from src/main/java/refinedstorage/container/ContainerDiskDrive.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskDrive.java index a39801384..56e976a81 100755 --- a/src/main/java/refinedstorage/container/ContainerDiskDrive.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskDrive.java @@ -1,11 +1,11 @@ -package refinedstorage.container; +package com.raoulvdberge.refinedstorage.container; +import com.raoulvdberge.refinedstorage.container.slot.SlotSpecimenType; +import com.raoulvdberge.refinedstorage.tile.TileDiskDrive; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.items.SlotItemHandler; -import refinedstorage.container.slot.SlotSpecimenType; -import refinedstorage.tile.TileDiskDrive; public class ContainerDiskDrive extends ContainerBase { public ContainerDiskDrive(TileDiskDrive drive, EntityPlayer player) { diff --git a/src/main/java/refinedstorage/container/ContainerDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskManipulator.java similarity index 90% rename from src/main/java/refinedstorage/container/ContainerDiskManipulator.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskManipulator.java index 86b812080..7926e4a47 100755 --- a/src/main/java/refinedstorage/container/ContainerDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskManipulator.java @@ -1,11 +1,11 @@ -package refinedstorage.container; +package com.raoulvdberge.refinedstorage.container; +import com.raoulvdberge.refinedstorage.container.slot.SlotSpecimenType; +import com.raoulvdberge.refinedstorage.tile.TileDiskManipulator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.items.SlotItemHandler; -import refinedstorage.container.slot.SlotSpecimenType; -import refinedstorage.tile.TileDiskManipulator; public class ContainerDiskManipulator extends ContainerBase { public ContainerDiskManipulator(TileDiskManipulator manipulator, EntityPlayer player) { diff --git a/src/main/java/refinedstorage/container/ContainerExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExporter.java similarity index 88% rename from src/main/java/refinedstorage/container/ContainerExporter.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExporter.java index c3b29a4f5..7fc46bb94 100755 --- a/src/main/java/refinedstorage/container/ContainerExporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExporter.java @@ -1,51 +1,51 @@ -package refinedstorage.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraftforge.items.SlotItemHandler; -import refinedstorage.container.slot.SlotSpecimenType; -import refinedstorage.tile.TileExporter; - -public class ContainerExporter extends ContainerBase { - public ContainerExporter(TileExporter exporter, EntityPlayer player) { - super(exporter, player); - - for (int i = 0; i < 4; ++i) { - addSlotToContainer(new SlotItemHandler(exporter.getUpgrades(), i, 187, 6 + (i * 18))); - } - - for (int i = 0; i < 9; ++i) { - addSlotToContainer(new SlotSpecimenType(exporter, i, 8 + (18 * i), 20)); - } - - addPlayerInventory(8, 55); - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int index) { - ItemStack stack = null; - - Slot slot = getSlot(index); - - if (slot != null && slot.getHasStack()) { - stack = slot.getStack(); - - if (index < 4) { - if (!mergeItemStack(stack, 4 + 9, inventorySlots.size(), false)) { - return null; - } - } else if (!mergeItemStack(stack, 0, 4, false)) { - return mergeItemStackToSpecimen(stack, 4, 4 + 9); - } - - if (stack.stackSize == 0) { - slot.putStack(null); - } else { - slot.onSlotChanged(); - } - } - - return stack; - } -} +package com.raoulvdberge.refinedstorage.container; + +import com.raoulvdberge.refinedstorage.container.slot.SlotSpecimenType; +import com.raoulvdberge.refinedstorage.tile.TileExporter; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraftforge.items.SlotItemHandler; + +public class ContainerExporter extends ContainerBase { + public ContainerExporter(TileExporter exporter, EntityPlayer player) { + super(exporter, player); + + for (int i = 0; i < 4; ++i) { + addSlotToContainer(new SlotItemHandler(exporter.getUpgrades(), i, 187, 6 + (i * 18))); + } + + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new SlotSpecimenType(exporter, i, 8 + (18 * i), 20)); + } + + addPlayerInventory(8, 55); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + ItemStack stack = null; + + Slot slot = getSlot(index); + + if (slot != null && slot.getHasStack()) { + stack = slot.getStack(); + + if (index < 4) { + if (!mergeItemStack(stack, 4 + 9, inventorySlots.size(), false)) { + return null; + } + } else if (!mergeItemStack(stack, 0, 4, false)) { + return mergeItemStackToSpecimen(stack, 4, 4 + 9); + } + + if (stack.stackSize == 0) { + slot.putStack(null); + } else { + slot.onSlotChanged(); + } + } + + return stack; + } +} diff --git a/src/main/java/refinedstorage/container/ContainerExternalStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExternalStorage.java similarity index 79% rename from src/main/java/refinedstorage/container/ContainerExternalStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExternalStorage.java index 248cb990e..24ae8c58f 100755 --- a/src/main/java/refinedstorage/container/ContainerExternalStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExternalStorage.java @@ -1,10 +1,10 @@ -package refinedstorage.container; +package com.raoulvdberge.refinedstorage.container; +import com.raoulvdberge.refinedstorage.container.slot.SlotSpecimenType; +import com.raoulvdberge.refinedstorage.tile.externalstorage.TileExternalStorage; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import refinedstorage.container.slot.SlotSpecimenType; -import refinedstorage.tile.externalstorage.TileExternalStorage; public class ContainerExternalStorage extends ContainerBase { public ContainerExternalStorage(TileExternalStorage tile, EntityPlayer player) { diff --git a/src/main/java/refinedstorage/container/ContainerFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidInterface.java similarity index 89% rename from src/main/java/refinedstorage/container/ContainerFluidInterface.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidInterface.java index adbf382f0..59f4a0a48 100755 --- a/src/main/java/refinedstorage/container/ContainerFluidInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidInterface.java @@ -1,11 +1,11 @@ -package refinedstorage.container; +package com.raoulvdberge.refinedstorage.container; +import com.raoulvdberge.refinedstorage.container.slot.SlotSpecimenFluid; +import com.raoulvdberge.refinedstorage.tile.TileFluidInterface; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.items.SlotItemHandler; -import refinedstorage.container.slot.SlotSpecimenFluid; -import refinedstorage.tile.TileFluidInterface; public class ContainerFluidInterface extends ContainerBase { public ContainerFluidInterface(TileFluidInterface fluidInterface, EntityPlayer player) { diff --git a/src/main/java/refinedstorage/container/ContainerFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidStorage.java similarity index 81% rename from src/main/java/refinedstorage/container/ContainerFluidStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidStorage.java index 85f8a4445..12ece9cc3 100755 --- a/src/main/java/refinedstorage/container/ContainerFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidStorage.java @@ -1,10 +1,10 @@ -package refinedstorage.container; +package com.raoulvdberge.refinedstorage.container; +import com.raoulvdberge.refinedstorage.container.slot.SlotSpecimenFluid; +import com.raoulvdberge.refinedstorage.tile.TileFluidStorage; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import refinedstorage.container.slot.SlotSpecimenFluid; -import refinedstorage.tile.TileFluidStorage; public class ContainerFluidStorage extends ContainerBase { public ContainerFluidStorage(TileFluidStorage tile, EntityPlayer player) { diff --git a/src/main/java/refinedstorage/container/ContainerGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java similarity index 91% rename from src/main/java/refinedstorage/container/ContainerGrid.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java index 9f366c112..ab57591fa 100755 --- a/src/main/java/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java @@ -1,16 +1,16 @@ -package refinedstorage.container; +package com.raoulvdberge.refinedstorage.container; +import com.raoulvdberge.refinedstorage.block.EnumGridType; +import com.raoulvdberge.refinedstorage.container.slot.*; +import com.raoulvdberge.refinedstorage.tile.TileBase; +import com.raoulvdberge.refinedstorage.tile.grid.IGrid; +import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; +import com.raoulvdberge.refinedstorage.tile.grid.WirelessGrid; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.items.SlotItemHandler; -import refinedstorage.block.EnumGridType; -import refinedstorage.container.slot.*; -import refinedstorage.tile.TileBase; -import refinedstorage.tile.grid.IGrid; -import refinedstorage.tile.grid.TileGrid; -import refinedstorage.tile.grid.WirelessGrid; public class ContainerGrid extends ContainerBase { private IGrid grid; diff --git a/src/main/java/refinedstorage/container/ContainerGridFilter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGridFilter.java similarity index 85% rename from src/main/java/refinedstorage/container/ContainerGridFilter.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGridFilter.java index 86acaa40b..1ee5eed16 100755 --- a/src/main/java/refinedstorage/container/ContainerGridFilter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGridFilter.java @@ -1,10 +1,10 @@ -package refinedstorage.container; +package com.raoulvdberge.refinedstorage.container; +import com.raoulvdberge.refinedstorage.container.slot.SlotSpecimen; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerGridFilter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import refinedstorage.container.slot.SlotSpecimen; -import refinedstorage.inventory.ItemHandlerGridFilter; public class ContainerGridFilter extends ContainerBase { private ItemHandlerGridFilter filter; diff --git a/src/main/java/refinedstorage/container/ContainerImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerImporter.java similarity index 88% rename from src/main/java/refinedstorage/container/ContainerImporter.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerImporter.java index 01e5f805b..7c7b2e831 100755 --- a/src/main/java/refinedstorage/container/ContainerImporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerImporter.java @@ -1,51 +1,51 @@ -package refinedstorage.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraftforge.items.SlotItemHandler; -import refinedstorage.container.slot.SlotSpecimenType; -import refinedstorage.tile.TileImporter; - -public class ContainerImporter extends ContainerBase { - public ContainerImporter(TileImporter importer, EntityPlayer player) { - super(importer, player); - - for (int i = 0; i < 4; ++i) { - addSlotToContainer(new SlotItemHandler(importer.getUpgrades(), i, 187, 6 + (i * 18))); - } - - for (int i = 0; i < 9; ++i) { - addSlotToContainer(new SlotSpecimenType(importer, i, 8 + (18 * i), 20)); - } - - addPlayerInventory(8, 55); - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int index) { - ItemStack stack = null; - - Slot slot = getSlot(index); - - if (slot != null && slot.getHasStack()) { - stack = slot.getStack(); - - if (index < 4) { - if (!mergeItemStack(stack, 4 + 9, inventorySlots.size(), false)) { - return null; - } - } else if (!mergeItemStack(stack, 0, 4, false)) { - return mergeItemStackToSpecimen(stack, 4, 4 + 9); - } - - if (stack.stackSize == 0) { - slot.putStack(null); - } else { - slot.onSlotChanged(); - } - } - - return stack; - } -} +package com.raoulvdberge.refinedstorage.container; + +import com.raoulvdberge.refinedstorage.container.slot.SlotSpecimenType; +import com.raoulvdberge.refinedstorage.tile.TileImporter; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraftforge.items.SlotItemHandler; + +public class ContainerImporter extends ContainerBase { + public ContainerImporter(TileImporter importer, EntityPlayer player) { + super(importer, player); + + for (int i = 0; i < 4; ++i) { + addSlotToContainer(new SlotItemHandler(importer.getUpgrades(), i, 187, 6 + (i * 18))); + } + + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new SlotSpecimenType(importer, i, 8 + (18 * i), 20)); + } + + addPlayerInventory(8, 55); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + ItemStack stack = null; + + Slot slot = getSlot(index); + + if (slot != null && slot.getHasStack()) { + stack = slot.getStack(); + + if (index < 4) { + if (!mergeItemStack(stack, 4 + 9, inventorySlots.size(), false)) { + return null; + } + } else if (!mergeItemStack(stack, 0, 4, false)) { + return mergeItemStackToSpecimen(stack, 4, 4 + 9); + } + + if (stack.stackSize == 0) { + slot.putStack(null); + } else { + slot.onSlotChanged(); + } + } + + return stack; + } +} diff --git a/src/main/java/refinedstorage/container/ContainerInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerInterface.java similarity index 87% rename from src/main/java/refinedstorage/container/ContainerInterface.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerInterface.java index 07aa7c911..486462515 100755 --- a/src/main/java/refinedstorage/container/ContainerInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerInterface.java @@ -1,60 +1,60 @@ -package refinedstorage.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraftforge.items.SlotItemHandler; -import refinedstorage.container.slot.SlotOutput; -import refinedstorage.container.slot.SlotSpecimen; -import refinedstorage.tile.TileInterface; - -public class ContainerInterface extends ContainerBase { - public ContainerInterface(TileInterface tile, EntityPlayer player) { - super(tile, player); - - for (int i = 0; i < 9; ++i) { - addSlotToContainer(new SlotItemHandler(tile.getImportItems(), i, 8 + (18 * i), 20)); - } - - for (int i = 0; i < 9; ++i) { - addSlotToContainer(new SlotSpecimen(tile.getExportSpecimenItems(), i, 8 + (18 * i), 54, SlotSpecimen.SPECIMEN_SIZE)); - } - - for (int i = 0; i < 9; ++i) { - addSlotToContainer(new SlotOutput(tile.getExportItems(), i, 8 + (18 * i), 100)); - } - - for (int i = 0; i < 4; ++i) { - addSlotToContainer(new SlotItemHandler(tile.getUpgrades(), i, 187, 6 + (i * 18))); - } - - addPlayerInventory(8, 134); - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int index) { - ItemStack stack = null; - - Slot slot = getSlot(index); - - if (slot != null && slot.getHasStack()) { - stack = slot.getStack(); - - if (index < 9) { - if (!mergeItemStack(stack, 9 + 9 + 9 + 4, inventorySlots.size(), false)) { - return null; - } - } else if (!mergeItemStack(stack, 0, 9, false)) { - return null; - } - - if (stack.stackSize == 0) { - slot.putStack(null); - } else { - slot.onSlotChanged(); - } - } - - return stack; - } -} +package com.raoulvdberge.refinedstorage.container; + +import com.raoulvdberge.refinedstorage.container.slot.SlotOutput; +import com.raoulvdberge.refinedstorage.container.slot.SlotSpecimen; +import com.raoulvdberge.refinedstorage.tile.TileInterface; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraftforge.items.SlotItemHandler; + +public class ContainerInterface extends ContainerBase { + public ContainerInterface(TileInterface tile, EntityPlayer player) { + super(tile, player); + + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new SlotItemHandler(tile.getImportItems(), i, 8 + (18 * i), 20)); + } + + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new SlotSpecimen(tile.getExportSpecimenItems(), i, 8 + (18 * i), 54, SlotSpecimen.SPECIMEN_SIZE)); + } + + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new SlotOutput(tile.getExportItems(), i, 8 + (18 * i), 100)); + } + + for (int i = 0; i < 4; ++i) { + addSlotToContainer(new SlotItemHandler(tile.getUpgrades(), i, 187, 6 + (i * 18))); + } + + addPlayerInventory(8, 134); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + ItemStack stack = null; + + Slot slot = getSlot(index); + + if (slot != null && slot.getHasStack()) { + stack = slot.getStack(); + + if (index < 9) { + if (!mergeItemStack(stack, 9 + 9 + 9 + 4, inventorySlots.size(), false)) { + return null; + } + } else if (!mergeItemStack(stack, 0, 9, false)) { + return null; + } + + if (stack.stackSize == 0) { + slot.putStack(null); + } else { + slot.onSlotChanged(); + } + } + + return stack; + } +} diff --git a/src/main/java/refinedstorage/container/ContainerNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerNetworkTransmitter.java similarity index 91% rename from src/main/java/refinedstorage/container/ContainerNetworkTransmitter.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerNetworkTransmitter.java index 9de920677..239f6a222 100755 --- a/src/main/java/refinedstorage/container/ContainerNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerNetworkTransmitter.java @@ -1,10 +1,10 @@ -package refinedstorage.container; +package com.raoulvdberge.refinedstorage.container; +import com.raoulvdberge.refinedstorage.tile.TileNetworkTransmitter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.items.SlotItemHandler; -import refinedstorage.tile.TileNetworkTransmitter; public class ContainerNetworkTransmitter extends ContainerBase { public ContainerNetworkTransmitter(TileNetworkTransmitter networkTransmitter, EntityPlayer player) { diff --git a/src/main/java/refinedstorage/container/ContainerProcessingPatternEncoder.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerProcessingPatternEncoder.java similarity index 91% rename from src/main/java/refinedstorage/container/ContainerProcessingPatternEncoder.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerProcessingPatternEncoder.java index 0e7b882fc..28a06f89e 100755 --- a/src/main/java/refinedstorage/container/ContainerProcessingPatternEncoder.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerProcessingPatternEncoder.java @@ -1,12 +1,12 @@ -package refinedstorage.container; +package com.raoulvdberge.refinedstorage.container; +import com.raoulvdberge.refinedstorage.container.slot.SlotOutput; +import com.raoulvdberge.refinedstorage.container.slot.SlotSpecimen; +import com.raoulvdberge.refinedstorage.tile.TileProcessingPatternEncoder; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.items.SlotItemHandler; -import refinedstorage.container.slot.SlotOutput; -import refinedstorage.container.slot.SlotSpecimen; -import refinedstorage.tile.TileProcessingPatternEncoder; import java.util.Collection; diff --git a/src/main/java/refinedstorage/container/ContainerRelay.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerRelay.java similarity index 69% rename from src/main/java/refinedstorage/container/ContainerRelay.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerRelay.java index 234d2eb60..ea6a96979 100755 --- a/src/main/java/refinedstorage/container/ContainerRelay.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerRelay.java @@ -1,12 +1,12 @@ -package refinedstorage.container; - -import net.minecraft.entity.player.EntityPlayer; -import refinedstorage.tile.TileRelay; - -public class ContainerRelay extends ContainerBase { - public ContainerRelay(TileRelay relay, EntityPlayer player) { - super(relay, player); - - addPlayerInventory(8, 50); - } -} +package com.raoulvdberge.refinedstorage.container; + +import com.raoulvdberge.refinedstorage.tile.TileRelay; +import net.minecraft.entity.player.EntityPlayer; + +public class ContainerRelay extends ContainerBase { + public ContainerRelay(TileRelay relay, EntityPlayer player) { + super(relay, player); + + addPlayerInventory(8, 50); + } +} diff --git a/src/main/java/refinedstorage/container/ContainerSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerSolderer.java similarity index 89% rename from src/main/java/refinedstorage/container/ContainerSolderer.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerSolderer.java index 6933e7fdd..314c5d22c 100755 --- a/src/main/java/refinedstorage/container/ContainerSolderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerSolderer.java @@ -1,67 +1,67 @@ -package refinedstorage.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraftforge.items.SlotItemHandler; -import refinedstorage.RSItems; -import refinedstorage.container.slot.SlotOutput; -import refinedstorage.tile.TileSolderer; - -public class ContainerSolderer extends ContainerBase { - public ContainerSolderer(TileSolderer solderer, EntityPlayer player) { - super(solderer, player); - - int x = 44; - int y = 20; - - for (int i = 0; i < 3; ++i) { - addSlotToContainer(new SlotItemHandler(solderer.getItems(), i, x, y)); - - y += 18; - } - - addSlotToContainer(new SlotOutput(solderer.getResult(), 0, 127, 38)); - - for (int i = 0; i < 4; ++i) { - addSlotToContainer(new SlotItemHandler(solderer.getUpgrades(), i, 187, 6 + (i * 18))); - } - - addPlayerInventory(8, 89); - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int index) { - ItemStack stack = null; - - Slot slot = getSlot(index); - - if (slot != null && slot.getHasStack()) { - stack = slot.getStack(); - - if (index < 4) { - if (!mergeItemStack(stack, 4 + 4, inventorySlots.size(), false)) { - return null; - } - } else if (index < 4 + 4) { - if (!mergeItemStack(stack, 4 + 4, inventorySlots.size(), false)) { - return null; - } - } else { - if (stack.getItem() != RSItems.UPGRADE || !mergeItemStack(stack, 4, 4 + 4, false)) { - if (!mergeItemStack(stack, 0, 3, false)) { // 0 - 3 because we can't shift click to output slot - return null; - } - } - } - - if (stack.stackSize == 0) { - slot.putStack(null); - } else { - slot.onSlotChanged(); - } - } - - return stack; - } -} +package com.raoulvdberge.refinedstorage.container; + +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.container.slot.SlotOutput; +import com.raoulvdberge.refinedstorage.tile.TileSolderer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraftforge.items.SlotItemHandler; + +public class ContainerSolderer extends ContainerBase { + public ContainerSolderer(TileSolderer solderer, EntityPlayer player) { + super(solderer, player); + + int x = 44; + int y = 20; + + for (int i = 0; i < 3; ++i) { + addSlotToContainer(new SlotItemHandler(solderer.getItems(), i, x, y)); + + y += 18; + } + + addSlotToContainer(new SlotOutput(solderer.getResult(), 0, 127, 38)); + + for (int i = 0; i < 4; ++i) { + addSlotToContainer(new SlotItemHandler(solderer.getUpgrades(), i, 187, 6 + (i * 18))); + } + + addPlayerInventory(8, 89); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + ItemStack stack = null; + + Slot slot = getSlot(index); + + if (slot != null && slot.getHasStack()) { + stack = slot.getStack(); + + if (index < 4) { + if (!mergeItemStack(stack, 4 + 4, inventorySlots.size(), false)) { + return null; + } + } else if (index < 4 + 4) { + if (!mergeItemStack(stack, 4 + 4, inventorySlots.size(), false)) { + return null; + } + } else { + if (stack.getItem() != RSItems.UPGRADE || !mergeItemStack(stack, 4, 4 + 4, false)) { + if (!mergeItemStack(stack, 0, 3, false)) { // 0 - 3 because we can't shift click to output slot + return null; + } + } + } + + if (stack.stackSize == 0) { + slot.putStack(null); + } else { + slot.onSlotChanged(); + } + } + + return stack; + } +} diff --git a/src/main/java/refinedstorage/container/ContainerStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorage.java similarity index 81% rename from src/main/java/refinedstorage/container/ContainerStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorage.java index 01f93d584..783fa458d 100755 --- a/src/main/java/refinedstorage/container/ContainerStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorage.java @@ -1,30 +1,30 @@ -package refinedstorage.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import refinedstorage.container.slot.SlotSpecimen; -import refinedstorage.tile.TileStorage; - -public class ContainerStorage extends ContainerBase { - public ContainerStorage(TileStorage tile, EntityPlayer player) { - super(tile, player); - - for (int i = 0; i < 9; ++i) { - addSlotToContainer(new SlotSpecimen(tile.getFilters(), i, 8 + (18 * i), 20)); - } - - addPlayerInventory(8, 129); - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int index) { - Slot slot = getSlot(index); - - if (slot != null && slot.getHasStack() && index >= 8) { - return mergeItemStackToSpecimen(slot.getStack(), 0, 9); - } - - return null; - } -} +package com.raoulvdberge.refinedstorage.container; + +import com.raoulvdberge.refinedstorage.container.slot.SlotSpecimen; +import com.raoulvdberge.refinedstorage.tile.TileStorage; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class ContainerStorage extends ContainerBase { + public ContainerStorage(TileStorage tile, EntityPlayer player) { + super(tile, player); + + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new SlotSpecimen(tile.getFilters(), i, 8 + (18 * i), 20)); + } + + addPlayerInventory(8, 129); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + Slot slot = getSlot(index); + + if (slot != null && slot.getHasStack() && index >= 8) { + return mergeItemStackToSpecimen(slot.getStack(), 0, 9); + } + + return null; + } +} diff --git a/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerWirelessTransmitter.java similarity index 91% rename from src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ContainerWirelessTransmitter.java index cb980c13c..020657ee9 100755 --- a/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerWirelessTransmitter.java @@ -1,10 +1,10 @@ -package refinedstorage.container; +package com.raoulvdberge.refinedstorage.container; +import com.raoulvdberge.refinedstorage.tile.TileWirelessTransmitter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.items.SlotItemHandler; -import refinedstorage.tile.TileWirelessTransmitter; public class ContainerWirelessTransmitter extends ContainerBase { public ContainerWirelessTransmitter(TileWirelessTransmitter wirelessTransmitter, EntityPlayer player) { diff --git a/src/main/java/refinedstorage/container/slot/SlotDisabled.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotDisabled.java similarity index 86% rename from src/main/java/refinedstorage/container/slot/SlotDisabled.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotDisabled.java index a350b648b..22a97b2f0 100755 --- a/src/main/java/refinedstorage/container/slot/SlotDisabled.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotDisabled.java @@ -1,16 +1,16 @@ -package refinedstorage.container.slot; - -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -public class SlotDisabled extends Slot { - public SlotDisabled(IInventory inventory, int id, int x, int y) { - super(inventory, id, x, y); - } - - @Override - public boolean isItemValid(ItemStack stack) { - return false; - } -} +package com.raoulvdberge.refinedstorage.container.slot; + +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class SlotDisabled extends Slot { + public SlotDisabled(IInventory inventory, int id, int x, int y) { + super(inventory, id, x, y); + } + + @Override + public boolean isItemValid(ItemStack stack) { + return false; + } +} diff --git a/src/main/java/refinedstorage/container/slot/SlotGridCrafting.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotGridCrafting.java similarity index 81% rename from src/main/java/refinedstorage/container/slot/SlotGridCrafting.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotGridCrafting.java index 108e54b9e..0c4fc05a6 100755 --- a/src/main/java/refinedstorage/container/slot/SlotGridCrafting.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotGridCrafting.java @@ -1,4 +1,4 @@ -package refinedstorage.container.slot; +package com.raoulvdberge.refinedstorage.container.slot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotGridCraftingResult.java similarity index 83% rename from src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotGridCraftingResult.java index 391e65560..c9d10f3d0 100755 --- a/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotGridCraftingResult.java @@ -1,11 +1,11 @@ -package refinedstorage.container.slot; +package com.raoulvdberge.refinedstorage.container.slot; +import com.raoulvdberge.refinedstorage.container.ContainerGrid; +import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.FMLCommonHandler; -import refinedstorage.container.ContainerGrid; -import refinedstorage.tile.grid.TileGrid; public class SlotGridCraftingResult extends SlotCrafting { private ContainerGrid container; diff --git a/src/main/java/refinedstorage/container/slot/SlotOutput.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotOutput.java similarity index 87% rename from src/main/java/refinedstorage/container/slot/SlotOutput.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotOutput.java index f129a1f46..cd2f7d0cc 100755 --- a/src/main/java/refinedstorage/container/slot/SlotOutput.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotOutput.java @@ -1,16 +1,16 @@ -package refinedstorage.container.slot; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.SlotItemHandler; - -public class SlotOutput extends SlotItemHandler { - public SlotOutput(IItemHandler inventory, int id, int x, int y) { - super(inventory, id, x, y); - } - - @Override - public boolean isItemValid(ItemStack stack) { - return false; - } -} +package com.raoulvdberge.refinedstorage.container.slot; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.SlotItemHandler; + +public class SlotOutput extends SlotItemHandler { + public SlotOutput(IItemHandler inventory, int id, int x, int y) { + super(inventory, id, x, y); + } + + @Override + public boolean isItemValid(ItemStack stack) { + return false; + } +} diff --git a/src/main/java/refinedstorage/container/slot/SlotSpecimen.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotSpecimen.java similarity index 95% rename from src/main/java/refinedstorage/container/slot/SlotSpecimen.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotSpecimen.java index 48818fcf8..635a4ce5a 100755 --- a/src/main/java/refinedstorage/container/slot/SlotSpecimen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotSpecimen.java @@ -1,82 +1,82 @@ -package refinedstorage.container.slot; - -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.*; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.IPlantable; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.SlotItemHandler; - -import java.lang.reflect.Field; - -public class SlotSpecimen extends SlotItemHandler { - public static final int SPECIMEN_SIZE = 1; - public static final int SPECIMEN_BLOCK = 2; - - private int flags = 0; - - public SlotSpecimen(IItemHandler handler, int id, int x, int y, int flags) { - super(handler, id, x, y); - - this.flags = flags; - } - - public SlotSpecimen(IItemHandler handler, int id, int x, int y) { - this(handler, id, x, y, 0); - } - - @Override - public boolean canTakeStack(EntityPlayer player) { - return false; - } - - @Override - public boolean isItemValid(ItemStack stack) { - return super.isItemValid(stack) && (isBlockOnly() ? (stack.getItem() instanceof ItemBlock || stack.getItem() instanceof ItemBlockSpecial || stack.getItem() instanceof IPlantable || stack.getItem() instanceof ItemSkull) : true); - } - - @Override - public void putStack(ItemStack stack) { - if (stack != null && !isWithSize()) { - stack.stackSize = 1; - } - - super.putStack(stack); - } - - public boolean isWithSize() { - return (flags & SPECIMEN_SIZE) == SPECIMEN_SIZE; - } - - public boolean isBlockOnly() { - return (flags & SPECIMEN_BLOCK) == SPECIMEN_BLOCK; - } - - public static IBlockState getBlockState(IBlockAccess world, BlockPos pos, ItemStack stack) { - if (stack != null) { - Item item = stack.getItem(); - - if (item instanceof ItemBlockSpecial) { - try { - Field f = ((ItemBlockSpecial) item).getClass().getDeclaredField("block"); - f.setAccessible(true); - return ((Block) f.get(item)).getDefaultState(); - } catch (IllegalAccessException | NoSuchFieldException e) { - // NO OP - } - } else if (item instanceof ItemBlock) { - return (((ItemBlock) item).getBlock()).getDefaultState(); - } else if (item instanceof IPlantable) { - return ((IPlantable) item).getPlant(world, pos); - } else if (item instanceof ItemSkull) { - return Blocks.SKULL.getDefaultState(); - } - } - - return null; - } -} +package com.raoulvdberge.refinedstorage.container.slot; + +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.IPlantable; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.SlotItemHandler; + +import java.lang.reflect.Field; + +public class SlotSpecimen extends SlotItemHandler { + public static final int SPECIMEN_SIZE = 1; + public static final int SPECIMEN_BLOCK = 2; + + private int flags = 0; + + public SlotSpecimen(IItemHandler handler, int id, int x, int y, int flags) { + super(handler, id, x, y); + + this.flags = flags; + } + + public SlotSpecimen(IItemHandler handler, int id, int x, int y) { + this(handler, id, x, y, 0); + } + + @Override + public boolean canTakeStack(EntityPlayer player) { + return false; + } + + @Override + public boolean isItemValid(ItemStack stack) { + return super.isItemValid(stack) && (isBlockOnly() ? (stack.getItem() instanceof ItemBlock || stack.getItem() instanceof ItemBlockSpecial || stack.getItem() instanceof IPlantable || stack.getItem() instanceof ItemSkull) : true); + } + + @Override + public void putStack(ItemStack stack) { + if (stack != null && !isWithSize()) { + stack.stackSize = 1; + } + + super.putStack(stack); + } + + public boolean isWithSize() { + return (flags & SPECIMEN_SIZE) == SPECIMEN_SIZE; + } + + public boolean isBlockOnly() { + return (flags & SPECIMEN_BLOCK) == SPECIMEN_BLOCK; + } + + public static IBlockState getBlockState(IBlockAccess world, BlockPos pos, ItemStack stack) { + if (stack != null) { + Item item = stack.getItem(); + + if (item instanceof ItemBlockSpecial) { + try { + Field f = ((ItemBlockSpecial) item).getClass().getDeclaredField("block"); + f.setAccessible(true); + return ((Block) f.get(item)).getDefaultState(); + } catch (IllegalAccessException | NoSuchFieldException e) { + // NO OP + } + } else if (item instanceof ItemBlock) { + return (((ItemBlock) item).getBlock()).getDefaultState(); + } else if (item instanceof IPlantable) { + return ((IPlantable) item).getPlant(world, pos); + } else if (item instanceof ItemSkull) { + return Blocks.SKULL.getDefaultState(); + } + } + + return null; + } +} diff --git a/src/main/java/refinedstorage/container/slot/SlotSpecimenFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotSpecimenFluid.java similarity index 90% rename from src/main/java/refinedstorage/container/slot/SlotSpecimenFluid.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotSpecimenFluid.java index fb3917535..4ec30ee29 100755 --- a/src/main/java/refinedstorage/container/slot/SlotSpecimenFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotSpecimenFluid.java @@ -1,4 +1,4 @@ -package refinedstorage.container.slot; +package com.raoulvdberge.refinedstorage.container.slot; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/refinedstorage/container/slot/SlotSpecimenLegacy.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotSpecimenLegacy.java similarity index 92% rename from src/main/java/refinedstorage/container/slot/SlotSpecimenLegacy.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotSpecimenLegacy.java index 5ebace57a..b29cb9784 100755 --- a/src/main/java/refinedstorage/container/slot/SlotSpecimenLegacy.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotSpecimenLegacy.java @@ -1,4 +1,4 @@ -package refinedstorage.container.slot; +package com.raoulvdberge.refinedstorage.container.slot; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/refinedstorage/container/slot/SlotSpecimenType.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotSpecimenType.java similarity index 90% rename from src/main/java/refinedstorage/container/slot/SlotSpecimenType.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotSpecimenType.java index a0a20cb62..5c939d63a 100755 --- a/src/main/java/refinedstorage/container/slot/SlotSpecimenType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotSpecimenType.java @@ -1,9 +1,9 @@ -package refinedstorage.container.slot; +package com.raoulvdberge.refinedstorage.container.slot; +import com.raoulvdberge.refinedstorage.tile.config.IType; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.items.IItemHandler; -import refinedstorage.tile.config.IType; public class SlotSpecimenType extends SlotSpecimen { private IType type; diff --git a/src/main/java/refinedstorage/gui/GuiBase.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java similarity index 95% rename from src/main/java/refinedstorage/gui/GuiBase.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java index 7e594ec6a..d7d29089a 100755 --- a/src/main/java/refinedstorage/gui/GuiBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java @@ -1,5 +1,11 @@ -package refinedstorage.gui; +package com.raoulvdberge.refinedstorage.gui; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.api.render.IElementDrawer; +import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; +import com.raoulvdberge.refinedstorage.apiimpl.storage.fluid.FluidRenderer; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButton; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; @@ -12,12 +18,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.client.config.GuiCheckBox; import net.minecraftforge.items.SlotItemHandler; import org.lwjgl.input.Mouse; -import refinedstorage.RS; -import refinedstorage.api.render.IElementDrawer; -import refinedstorage.api.render.IElementDrawers; -import refinedstorage.apiimpl.storage.fluid.FluidRenderer; -import refinedstorage.gui.sidebutton.SideButton; -import refinedstorage.inventory.ItemHandlerFluid; import java.io.IOException; import java.util.Arrays; diff --git a/src/main/java/refinedstorage/gui/GuiConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiConstructor.java similarity index 68% rename from src/main/java/refinedstorage/gui/GuiConstructor.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiConstructor.java index 2e18d1ac9..72cf1a497 100755 --- a/src/main/java/refinedstorage/gui/GuiConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiConstructor.java @@ -1,44 +1,44 @@ -package refinedstorage.gui; - -import refinedstorage.api.util.IComparer; -import refinedstorage.container.ContainerConstructor; -import refinedstorage.gui.sidebutton.SideButtonCompare; -import refinedstorage.gui.sidebutton.SideButtonConstuctorDrop; -import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; -import refinedstorage.gui.sidebutton.SideButtonType; -import refinedstorage.tile.TileConstructor; - -public class GuiConstructor extends GuiBase { - public GuiConstructor(ContainerConstructor container) { - super(container, 211, 137); - } - - @Override - public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(this, TileConstructor.REDSTONE_MODE)); - - addSideButton(new SideButtonType(this, TileConstructor.TYPE)); - - addSideButton(new SideButtonCompare(this, TileConstructor.COMPARE, IComparer.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(this, TileConstructor.COMPARE, IComparer.COMPARE_NBT)); - addSideButton(new SideButtonCompare(this, TileConstructor.COMPARE, IComparer.COMPARE_OREDICT)); - addSideButton(new SideButtonConstuctorDrop(this)); - } - - @Override - public void update(int x, int y) { - } - - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) { - bindTexture("gui/constructor.png"); - - drawTexture(x, y, 0, 0, width, height); - } - - @Override - public void drawForeground(int mouseX, int mouseY) { - drawString(7, 7, t("gui.refinedstorage:constructor")); - drawString(7, 43, t("container.inventory")); - } -} +package com.raoulvdberge.refinedstorage.gui; + +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.container.ContainerConstructor; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonCompare; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonConstuctorDrop; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonType; +import com.raoulvdberge.refinedstorage.tile.TileConstructor; + +public class GuiConstructor extends GuiBase { + public GuiConstructor(ContainerConstructor container) { + super(container, 211, 137); + } + + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(this, TileConstructor.REDSTONE_MODE)); + + addSideButton(new SideButtonType(this, TileConstructor.TYPE)); + + addSideButton(new SideButtonCompare(this, TileConstructor.COMPARE, IComparer.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(this, TileConstructor.COMPARE, IComparer.COMPARE_NBT)); + addSideButton(new SideButtonCompare(this, TileConstructor.COMPARE, IComparer.COMPARE_OREDICT)); + addSideButton(new SideButtonConstuctorDrop(this)); + } + + @Override + public void update(int x, int y) { + } + + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/constructor.png"); + + drawTexture(x, y, 0, 0, width, height); + } + + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:constructor")); + drawString(7, 43, t("container.inventory")); + } +} diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiController.java similarity index 91% rename from src/main/java/refinedstorage/gui/GuiController.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiController.java index 8dfe4d090..ee545b850 100755 --- a/src/main/java/refinedstorage/gui/GuiController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiController.java @@ -1,111 +1,111 @@ -package refinedstorage.gui; - -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; -import refinedstorage.container.ContainerController; -import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; -import refinedstorage.tile.ClientNode; -import refinedstorage.tile.TileController; - -import java.util.List; - -public class GuiController extends GuiBase { - private static final int VISIBLE_ROWS = 2; - - private TileController controller; - - private int barX = 8; - private int barY = 20; - private int barWidth = 16; - private int barHeight = 59; - - public GuiController(ContainerController container, TileController controller) { - super(container, 176, 181); - - this.controller = controller; - - this.scrollbar = new Scrollbar(157, 20, 12, 59); - } - - @Override - public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(this, TileController.REDSTONE_MODE)); - } - - @Override - public void update(int x, int y) { - scrollbar.setEnabled(getRows() > VISIBLE_ROWS); - scrollbar.setMaxOffset(getRows() - VISIBLE_ROWS); - } - - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) { - bindTexture("gui/controller.png"); - - drawTexture(x, y, 0, 0, width, height); - - int barHeightNew = TileController.getEnergyScaled(TileController.ENERGY_STORED.getValue(), TileController.ENERGY_CAPACITY.getValue(), barHeight); - - drawTexture(x + barX, y + barY + barHeight - barHeightNew, 178, barHeight - barHeightNew, barWidth, barHeightNew); - } - - @Override - public void drawForeground(int mouseX, int mouseY) { - drawString(7, 7, t("gui.refinedstorage:controller." + controller.getType().getId())); - drawString(7, 87, t("container.inventory")); - - int x = 33; - int y = 26; - - int slot = scrollbar.getOffset() * 2; - - RenderHelper.enableGUIStandardItemLighting(); - - List nodes = TileController.NODES.getValue(); - - ClientNode nodeHovering = null; - - for (int i = 0; i < 4; ++i) { - if (slot < nodes.size()) { - ClientNode node = nodes.get(slot); - - drawItem(x, y + 5, node.getStack()); - - float scale = 0.5f; - - GlStateManager.pushMatrix(); - GlStateManager.scale(scale, scale, 1); - - drawString(calculateOffsetOnScale(x + 1, scale), calculateOffsetOnScale(y - 2, scale), node.getStack().getDisplayName()); - drawString(calculateOffsetOnScale(x + 21, scale), calculateOffsetOnScale(y + 10, scale), node.getAmount() + "x"); - - GlStateManager.popMatrix(); - - if (inBounds(x, y, 16, 16, mouseX, mouseY)) { - nodeHovering = node; - } - } - - if (i == 1) { - x = 33; - y += 30; - } else { - x += 60; - } - - slot++; - } - - if (nodeHovering != null) { - drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage_minimal", nodeHovering.getEnergyUsage())); - } - - if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { - drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage", TileController.ENERGY_USAGE.getValue()) + "\n" + t("misc.refinedstorage:energy_stored", TileController.ENERGY_STORED.getValue(), TileController.ENERGY_CAPACITY.getValue())); - } - } - - private int getRows() { - return Math.max(0, (int) Math.ceil((float) TileController.NODES.getValue().size() / 2F)); - } -} +package com.raoulvdberge.refinedstorage.gui; + +import com.raoulvdberge.refinedstorage.container.ContainerController; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.tile.ClientNode; +import com.raoulvdberge.refinedstorage.tile.TileController; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.RenderHelper; + +import java.util.List; + +public class GuiController extends GuiBase { + private static final int VISIBLE_ROWS = 2; + + private TileController controller; + + private int barX = 8; + private int barY = 20; + private int barWidth = 16; + private int barHeight = 59; + + public GuiController(ContainerController container, TileController controller) { + super(container, 176, 181); + + this.controller = controller; + + this.scrollbar = new Scrollbar(157, 20, 12, 59); + } + + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(this, TileController.REDSTONE_MODE)); + } + + @Override + public void update(int x, int y) { + scrollbar.setEnabled(getRows() > VISIBLE_ROWS); + scrollbar.setMaxOffset(getRows() - VISIBLE_ROWS); + } + + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/controller.png"); + + drawTexture(x, y, 0, 0, width, height); + + int barHeightNew = TileController.getEnergyScaled(TileController.ENERGY_STORED.getValue(), TileController.ENERGY_CAPACITY.getValue(), barHeight); + + drawTexture(x + barX, y + barY + barHeight - barHeightNew, 178, barHeight - barHeightNew, barWidth, barHeightNew); + } + + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:controller." + controller.getType().getId())); + drawString(7, 87, t("container.inventory")); + + int x = 33; + int y = 26; + + int slot = scrollbar.getOffset() * 2; + + RenderHelper.enableGUIStandardItemLighting(); + + List nodes = TileController.NODES.getValue(); + + ClientNode nodeHovering = null; + + for (int i = 0; i < 4; ++i) { + if (slot < nodes.size()) { + ClientNode node = nodes.get(slot); + + drawItem(x, y + 5, node.getStack()); + + float scale = 0.5f; + + GlStateManager.pushMatrix(); + GlStateManager.scale(scale, scale, 1); + + drawString(calculateOffsetOnScale(x + 1, scale), calculateOffsetOnScale(y - 2, scale), node.getStack().getDisplayName()); + drawString(calculateOffsetOnScale(x + 21, scale), calculateOffsetOnScale(y + 10, scale), node.getAmount() + "x"); + + GlStateManager.popMatrix(); + + if (inBounds(x, y, 16, 16, mouseX, mouseY)) { + nodeHovering = node; + } + } + + if (i == 1) { + x = 33; + y += 30; + } else { + x += 60; + } + + slot++; + } + + if (nodeHovering != null) { + drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage_minimal", nodeHovering.getEnergyUsage())); + } + + if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { + drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage", TileController.ENERGY_USAGE.getValue()) + "\n" + t("misc.refinedstorage:energy_stored", TileController.ENERGY_STORED.getValue(), TileController.ENERGY_CAPACITY.getValue())); + } + } + + private int getRows() { + return Math.max(0, (int) Math.ceil((float) TileController.NODES.getValue().size() / 2F)); + } +} diff --git a/src/main/java/refinedstorage/gui/GuiCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCrafter.java similarity index 69% rename from src/main/java/refinedstorage/gui/GuiCrafter.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCrafter.java index 020df6094..1b7a6ad34 100755 --- a/src/main/java/refinedstorage/gui/GuiCrafter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCrafter.java @@ -1,9 +1,9 @@ -package refinedstorage.gui; +package com.raoulvdberge.refinedstorage.gui; -import refinedstorage.container.ContainerCrafter; -import refinedstorage.gui.sidebutton.SideButtonCrafterTriggeredAutocrafting; -import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; -import refinedstorage.tile.TileCrafter; +import com.raoulvdberge.refinedstorage.container.ContainerCrafter; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonCrafterTriggeredAutocrafting; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.tile.TileCrafter; public class GuiCrafter extends GuiBase { public GuiCrafter(ContainerCrafter container) { diff --git a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java similarity index 90% rename from src/main/java/refinedstorage/gui/GuiCraftingMonitor.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java index 759e5c374..49991043b 100755 --- a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java @@ -1,17 +1,17 @@ -package refinedstorage.gui; +package com.raoulvdberge.refinedstorage.gui; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; +import com.raoulvdberge.refinedstorage.api.render.IElementDrawer; +import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; +import com.raoulvdberge.refinedstorage.container.ContainerCraftingMonitor; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.network.MessageCraftingMonitorCancel; +import com.raoulvdberge.refinedstorage.tile.TileCraftingMonitor; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.resources.I18n; -import refinedstorage.RS; -import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import refinedstorage.api.render.IElementDrawer; -import refinedstorage.api.render.IElementDrawers; -import refinedstorage.container.ContainerCraftingMonitor; -import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; -import refinedstorage.network.MessageCraftingMonitorCancel; -import refinedstorage.tile.TileCraftingMonitor; import java.io.IOException; import java.util.List; diff --git a/src/main/java/refinedstorage/gui/GuiCraftingPreview.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java similarity index 90% rename from src/main/java/refinedstorage/gui/GuiCraftingPreview.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java index ce63e8957..c09d088ca 100755 --- a/src/main/java/refinedstorage/gui/GuiCraftingPreview.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java @@ -1,5 +1,12 @@ -package refinedstorage.gui; +package com.raoulvdberge.refinedstorage.gui; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; +import com.raoulvdberge.refinedstorage.api.render.IElementDrawer; +import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementFluidStack; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementItemStack; +import com.raoulvdberge.refinedstorage.network.MessageGridCraftingStart; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; @@ -11,13 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.client.FMLClientHandler; import org.lwjgl.input.Keyboard; -import refinedstorage.RS; -import refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; -import refinedstorage.api.render.IElementDrawer; -import refinedstorage.api.render.IElementDrawers; -import refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementFluidStack; -import refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementItemStack; -import refinedstorage.network.MessageGridCraftingStart; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/refinedstorage/gui/GuiDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDestructor.java similarity index 80% rename from src/main/java/refinedstorage/gui/GuiDestructor.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDestructor.java index 8aea318f8..76c65f2ef 100755 --- a/src/main/java/refinedstorage/gui/GuiDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDestructor.java @@ -1,44 +1,44 @@ -package refinedstorage.gui; - -import refinedstorage.api.util.IComparer; -import refinedstorage.container.ContainerDestructor; -import refinedstorage.gui.sidebutton.*; -import refinedstorage.tile.TileDestructor; - -public class GuiDestructor extends GuiBase { - public GuiDestructor(ContainerDestructor container) { - super(container, 211, 137); - } - - @Override - public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(this, TileDestructor.REDSTONE_MODE)); - - addSideButton(new SideButtonType(this, TileDestructor.TYPE)); - - addSideButton(new SideButtonMode(this, TileDestructor.MODE)); - - addSideButton(new SideButtonCompare(this, TileDestructor.COMPARE, IComparer.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(this, TileDestructor.COMPARE, IComparer.COMPARE_NBT)); - addSideButton(new SideButtonCompare(this, TileDestructor.COMPARE, IComparer.COMPARE_OREDICT)); - - addSideButton(new SideButtonPickup(this)); - } - - @Override - public void update(int x, int y) { - } - - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) { - bindTexture("gui/destructor.png"); - - drawTexture(x, y, 0, 0, width, height); - } - - @Override - public void drawForeground(int mouseX, int mouseY) { - drawString(7, 7, t("gui.refinedstorage:destructor")); - drawString(7, 43, t("container.inventory")); - } -} +package com.raoulvdberge.refinedstorage.gui; + +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.container.ContainerDestructor; +import com.raoulvdberge.refinedstorage.gui.sidebutton.*; +import com.raoulvdberge.refinedstorage.tile.TileDestructor; + +public class GuiDestructor extends GuiBase { + public GuiDestructor(ContainerDestructor container) { + super(container, 211, 137); + } + + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(this, TileDestructor.REDSTONE_MODE)); + + addSideButton(new SideButtonType(this, TileDestructor.TYPE)); + + addSideButton(new SideButtonMode(this, TileDestructor.MODE)); + + addSideButton(new SideButtonCompare(this, TileDestructor.COMPARE, IComparer.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(this, TileDestructor.COMPARE, IComparer.COMPARE_NBT)); + addSideButton(new SideButtonCompare(this, TileDestructor.COMPARE, IComparer.COMPARE_OREDICT)); + + addSideButton(new SideButtonPickup(this)); + } + + @Override + public void update(int x, int y) { + } + + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/destructor.png"); + + drawTexture(x, y, 0, 0, width, height); + } + + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:destructor")); + drawString(7, 43, t("container.inventory")); + } +} diff --git a/src/main/java/refinedstorage/gui/GuiDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDetector.java similarity index 81% rename from src/main/java/refinedstorage/gui/GuiDetector.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDetector.java index 218a1aacd..36dc6a411 100755 --- a/src/main/java/refinedstorage/gui/GuiDetector.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDetector.java @@ -1,14 +1,14 @@ -package refinedstorage.gui; +package com.raoulvdberge.refinedstorage.gui; import com.google.common.primitives.Ints; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.container.ContainerDetector; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonCompare; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonDetectorMode; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonType; +import com.raoulvdberge.refinedstorage.tile.TileDetector; +import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import net.minecraft.client.gui.GuiTextField; -import refinedstorage.api.util.IComparer; -import refinedstorage.container.ContainerDetector; -import refinedstorage.gui.sidebutton.SideButtonCompare; -import refinedstorage.gui.sidebutton.SideButtonDetectorMode; -import refinedstorage.gui.sidebutton.SideButtonType; -import refinedstorage.tile.TileDetector; -import refinedstorage.tile.data.TileDataManager; import java.io.IOException; diff --git a/src/main/java/refinedstorage/gui/GuiDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDiskManipulator.java similarity index 82% rename from src/main/java/refinedstorage/gui/GuiDiskManipulator.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDiskManipulator.java index 1b7d55566..1f09c2eb5 100755 --- a/src/main/java/refinedstorage/gui/GuiDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDiskManipulator.java @@ -1,9 +1,9 @@ -package refinedstorage.gui; +package com.raoulvdberge.refinedstorage.gui; -import refinedstorage.api.util.IComparer; -import refinedstorage.container.ContainerDiskManipulator; -import refinedstorage.gui.sidebutton.*; -import refinedstorage.tile.TileDiskManipulator; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.container.ContainerDiskManipulator; +import com.raoulvdberge.refinedstorage.gui.sidebutton.*; +import com.raoulvdberge.refinedstorage.tile.TileDiskManipulator; public class GuiDiskManipulator extends GuiBase { public GuiDiskManipulator(ContainerDiskManipulator container) { diff --git a/src/main/java/refinedstorage/gui/GuiExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiExporter.java similarity index 70% rename from src/main/java/refinedstorage/gui/GuiExporter.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiExporter.java index f90840a66..55b4eb557 100755 --- a/src/main/java/refinedstorage/gui/GuiExporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiExporter.java @@ -1,42 +1,42 @@ -package refinedstorage.gui; - -import refinedstorage.api.util.IComparer; -import refinedstorage.container.ContainerExporter; -import refinedstorage.gui.sidebutton.SideButtonCompare; -import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; -import refinedstorage.gui.sidebutton.SideButtonType; -import refinedstorage.tile.TileExporter; - -public class GuiExporter extends GuiBase { - public GuiExporter(ContainerExporter container) { - super(container, 211, 137); - } - - @Override - public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(this, TileExporter.REDSTONE_MODE)); - - addSideButton(new SideButtonType(this, TileExporter.TYPE)); - - addSideButton(new SideButtonCompare(this, TileExporter.COMPARE, IComparer.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(this, TileExporter.COMPARE, IComparer.COMPARE_NBT)); - addSideButton(new SideButtonCompare(this, TileExporter.COMPARE, IComparer.COMPARE_OREDICT)); - } - - @Override - public void update(int x, int y) { - } - - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) { - bindTexture("gui/exporter.png"); - - drawTexture(x, y, 0, 0, width, height); - } - - @Override - public void drawForeground(int mouseX, int mouseY) { - drawString(7, 7, t("gui.refinedstorage:exporter")); - drawString(7, 43, t("container.inventory")); - } -} +package com.raoulvdberge.refinedstorage.gui; + +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.container.ContainerExporter; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonCompare; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonType; +import com.raoulvdberge.refinedstorage.tile.TileExporter; + +public class GuiExporter extends GuiBase { + public GuiExporter(ContainerExporter container) { + super(container, 211, 137); + } + + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(this, TileExporter.REDSTONE_MODE)); + + addSideButton(new SideButtonType(this, TileExporter.TYPE)); + + addSideButton(new SideButtonCompare(this, TileExporter.COMPARE, IComparer.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(this, TileExporter.COMPARE, IComparer.COMPARE_NBT)); + addSideButton(new SideButtonCompare(this, TileExporter.COMPARE, IComparer.COMPARE_OREDICT)); + } + + @Override + public void update(int x, int y) { + } + + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/exporter.png"); + + drawTexture(x, y, 0, 0, width, height); + } + + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:exporter")); + drawString(7, 43, t("container.inventory")); + } +} diff --git a/src/main/java/refinedstorage/gui/GuiFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiFluidInterface.java similarity index 81% rename from src/main/java/refinedstorage/gui/GuiFluidInterface.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiFluidInterface.java index fd5abc8f8..d2caf8b06 100755 --- a/src/main/java/refinedstorage/gui/GuiFluidInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiFluidInterface.java @@ -1,11 +1,11 @@ -package refinedstorage.gui; +package com.raoulvdberge.refinedstorage.gui; -import refinedstorage.api.util.IComparer; -import refinedstorage.apiimpl.storage.fluid.FluidRenderer; -import refinedstorage.container.ContainerFluidInterface; -import refinedstorage.gui.sidebutton.SideButtonCompare; -import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; -import refinedstorage.tile.TileFluidInterface; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.apiimpl.storage.fluid.FluidRenderer; +import com.raoulvdberge.refinedstorage.container.ContainerFluidInterface; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonCompare; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.tile.TileFluidInterface; public class GuiFluidInterface extends GuiBase { private static final FluidRenderer TANK_RENDERER = new FluidRenderer(TileFluidInterface.TANK_CAPACITY, 12, 47); diff --git a/src/main/java/refinedstorage/gui/GuiGridFilter.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiGridFilter.java similarity index 83% rename from src/main/java/refinedstorage/gui/GuiGridFilter.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiGridFilter.java index e726c5eec..4f3a4126a 100755 --- a/src/main/java/refinedstorage/gui/GuiGridFilter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiGridFilter.java @@ -1,12 +1,12 @@ -package refinedstorage.gui; +package com.raoulvdberge.refinedstorage.gui; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.container.ContainerGridFilter; +import com.raoulvdberge.refinedstorage.item.ItemGridFilter; +import com.raoulvdberge.refinedstorage.network.MessageGridFilterUpdate; import net.minecraft.client.gui.GuiButton; import net.minecraftforge.fml.client.config.GuiCheckBox; -import refinedstorage.RS; -import refinedstorage.api.util.IComparer; -import refinedstorage.container.ContainerGridFilter; -import refinedstorage.item.ItemGridFilter; -import refinedstorage.network.MessageGridFilterUpdate; import java.io.IOException; diff --git a/src/main/java/refinedstorage/gui/GuiHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiHandler.java similarity index 94% rename from src/main/java/refinedstorage/gui/GuiHandler.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiHandler.java index db10a7eda..029dcd10b 100755 --- a/src/main/java/refinedstorage/gui/GuiHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiHandler.java @@ -1,5 +1,12 @@ -package refinedstorage.gui; +package com.raoulvdberge.refinedstorage.gui; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.container.*; +import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid; +import com.raoulvdberge.refinedstorage.tile.*; +import com.raoulvdberge.refinedstorage.tile.externalstorage.TileExternalStorage; +import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; +import com.raoulvdberge.refinedstorage.tile.grid.WirelessGrid; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.tileentity.TileEntity; @@ -7,13 +14,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; -import refinedstorage.RSGui; -import refinedstorage.container.*; -import refinedstorage.gui.grid.GuiGrid; -import refinedstorage.tile.*; -import refinedstorage.tile.externalstorage.TileExternalStorage; -import refinedstorage.tile.grid.TileGrid; -import refinedstorage.tile.grid.WirelessGrid; public class GuiHandler implements IGuiHandler { private Container getContainer(int ID, EntityPlayer player, TileEntity tile) { diff --git a/src/main/java/refinedstorage/gui/GuiImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiImporter.java similarity index 68% rename from src/main/java/refinedstorage/gui/GuiImporter.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiImporter.java index a8b0590d8..34c2de3d2 100755 --- a/src/main/java/refinedstorage/gui/GuiImporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiImporter.java @@ -1,45 +1,45 @@ -package refinedstorage.gui; - -import refinedstorage.api.util.IComparer; -import refinedstorage.container.ContainerImporter; -import refinedstorage.gui.sidebutton.SideButtonCompare; -import refinedstorage.gui.sidebutton.SideButtonMode; -import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; -import refinedstorage.gui.sidebutton.SideButtonType; -import refinedstorage.tile.TileImporter; - -public class GuiImporter extends GuiBase { - public GuiImporter(ContainerImporter container) { - super(container, 211, 137); - } - - @Override - public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(this, TileImporter.REDSTONE_MODE)); - - addSideButton(new SideButtonType(this, TileImporter.TYPE)); - - addSideButton(new SideButtonMode(this, TileImporter.MODE)); - - addSideButton(new SideButtonCompare(this, TileImporter.COMPARE, IComparer.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(this, TileImporter.COMPARE, IComparer.COMPARE_NBT)); - addSideButton(new SideButtonCompare(this, TileImporter.COMPARE, IComparer.COMPARE_OREDICT)); - } - - @Override - public void update(int x, int y) { - } - - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) { - bindTexture("gui/importer.png"); - - drawTexture(x, y, 0, 0, width, height); - } - - @Override - public void drawForeground(int mouseX, int mouseY) { - drawString(7, 7, t("gui.refinedstorage:importer")); - drawString(7, 43, t("container.inventory")); - } -} +package com.raoulvdberge.refinedstorage.gui; + +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.container.ContainerImporter; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonCompare; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonMode; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonType; +import com.raoulvdberge.refinedstorage.tile.TileImporter; + +public class GuiImporter extends GuiBase { + public GuiImporter(ContainerImporter container) { + super(container, 211, 137); + } + + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(this, TileImporter.REDSTONE_MODE)); + + addSideButton(new SideButtonType(this, TileImporter.TYPE)); + + addSideButton(new SideButtonMode(this, TileImporter.MODE)); + + addSideButton(new SideButtonCompare(this, TileImporter.COMPARE, IComparer.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(this, TileImporter.COMPARE, IComparer.COMPARE_NBT)); + addSideButton(new SideButtonCompare(this, TileImporter.COMPARE, IComparer.COMPARE_OREDICT)); + } + + @Override + public void update(int x, int y) { + } + + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/importer.png"); + + drawTexture(x, y, 0, 0, width, height); + } + + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:importer")); + drawString(7, 43, t("container.inventory")); + } +} diff --git a/src/main/java/refinedstorage/gui/GuiInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiInterface.java similarity index 74% rename from src/main/java/refinedstorage/gui/GuiInterface.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiInterface.java index 84ac9ae57..4f37104ad 100755 --- a/src/main/java/refinedstorage/gui/GuiInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiInterface.java @@ -1,40 +1,40 @@ -package refinedstorage.gui; - -import refinedstorage.api.util.IComparer; -import refinedstorage.container.ContainerInterface; -import refinedstorage.gui.sidebutton.SideButtonCompare; -import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; -import refinedstorage.tile.TileInterface; - -public class GuiInterface extends GuiBase { - public GuiInterface(ContainerInterface container) { - super(container, 211, 217); - } - - @Override - public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(this, TileInterface.REDSTONE_MODE)); - - addSideButton(new SideButtonCompare(this, TileInterface.COMPARE, IComparer.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(this, TileInterface.COMPARE, IComparer.COMPARE_NBT)); - addSideButton(new SideButtonCompare(this, TileInterface.COMPARE, IComparer.COMPARE_OREDICT)); - } - - @Override - public void update(int x, int y) { - } - - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) { - bindTexture("gui/interface.png"); - - drawTexture(x, y, 0, 0, width, height); - } - - @Override - public void drawForeground(int mouseX, int mouseY) { - drawString(7, 7, t("gui.refinedstorage:interface.import")); - drawString(7, 42, t("gui.refinedstorage:interface.export")); - drawString(7, 122, t("container.inventory")); - } -} +package com.raoulvdberge.refinedstorage.gui; + +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.container.ContainerInterface; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonCompare; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.tile.TileInterface; + +public class GuiInterface extends GuiBase { + public GuiInterface(ContainerInterface container) { + super(container, 211, 217); + } + + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(this, TileInterface.REDSTONE_MODE)); + + addSideButton(new SideButtonCompare(this, TileInterface.COMPARE, IComparer.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(this, TileInterface.COMPARE, IComparer.COMPARE_NBT)); + addSideButton(new SideButtonCompare(this, TileInterface.COMPARE, IComparer.COMPARE_OREDICT)); + } + + @Override + public void update(int x, int y) { + } + + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/interface.png"); + + drawTexture(x, y, 0, 0, width, height); + } + + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:interface.import")); + drawString(7, 42, t("gui.refinedstorage:interface.export")); + drawString(7, 122, t("container.inventory")); + } +} diff --git a/src/main/java/refinedstorage/gui/GuiNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiNetworkTransmitter.java similarity index 87% rename from src/main/java/refinedstorage/gui/GuiNetworkTransmitter.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiNetworkTransmitter.java index 8e09afc5d..418d0cd2e 100755 --- a/src/main/java/refinedstorage/gui/GuiNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiNetworkTransmitter.java @@ -1,8 +1,8 @@ -package refinedstorage.gui; +package com.raoulvdberge.refinedstorage.gui; -import refinedstorage.container.ContainerNetworkTransmitter; -import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; -import refinedstorage.tile.TileNetworkTransmitter; +import com.raoulvdberge.refinedstorage.container.ContainerNetworkTransmitter; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.tile.TileNetworkTransmitter; public class GuiNetworkTransmitter extends GuiBase { private TileNetworkTransmitter networkTransmitter; diff --git a/src/main/java/refinedstorage/gui/GuiProcessingPatternEncoder.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiProcessingPatternEncoder.java similarity index 86% rename from src/main/java/refinedstorage/gui/GuiProcessingPatternEncoder.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiProcessingPatternEncoder.java index 0bceb777b..d1c17e88c 100755 --- a/src/main/java/refinedstorage/gui/GuiProcessingPatternEncoder.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiProcessingPatternEncoder.java @@ -1,12 +1,12 @@ -package refinedstorage.gui; +package com.raoulvdberge.refinedstorage.gui; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.container.ContainerProcessingPatternEncoder; +import com.raoulvdberge.refinedstorage.network.MessageGridPatternCreate; +import com.raoulvdberge.refinedstorage.network.MessageProcessingPatternEncoderClear; +import com.raoulvdberge.refinedstorage.tile.TileProcessingPatternEncoder; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.init.SoundEvents; -import refinedstorage.RS; -import refinedstorage.container.ContainerProcessingPatternEncoder; -import refinedstorage.network.MessageGridPatternCreate; -import refinedstorage.network.MessageProcessingPatternEncoderClear; -import refinedstorage.tile.TileProcessingPatternEncoder; import java.io.IOException; diff --git a/src/main/java/refinedstorage/gui/GuiRelay.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiRelay.java similarity index 74% rename from src/main/java/refinedstorage/gui/GuiRelay.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiRelay.java index e5adf6c26..fe7764d26 100755 --- a/src/main/java/refinedstorage/gui/GuiRelay.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiRelay.java @@ -1,33 +1,33 @@ -package refinedstorage.gui; - -import refinedstorage.container.ContainerRelay; -import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; -import refinedstorage.tile.TileRelay; - -public class GuiRelay extends GuiBase { - public GuiRelay(ContainerRelay container) { - super(container, 176, 131); - } - - @Override - public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(this, TileRelay.REDSTONE_MODE)); - } - - @Override - public void update(int x, int y) { - } - - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) { - bindTexture("gui/relay.png"); - - drawTexture(x, y, 0, 0, width, height); - } - - @Override - public void drawForeground(int mouseX, int mouseY) { - drawString(7, 7, t("gui.refinedstorage:relay")); - drawString(7, 39, t("container.inventory")); - } -} +package com.raoulvdberge.refinedstorage.gui; + +import com.raoulvdberge.refinedstorage.container.ContainerRelay; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.tile.TileRelay; + +public class GuiRelay extends GuiBase { + public GuiRelay(ContainerRelay container) { + super(container, 176, 131); + } + + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(this, TileRelay.REDSTONE_MODE)); + } + + @Override + public void update(int x, int y) { + } + + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/relay.png"); + + drawTexture(x, y, 0, 0, width, height); + } + + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:relay")); + drawString(7, 39, t("container.inventory")); + } +} diff --git a/src/main/java/refinedstorage/gui/GuiSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiSolderer.java similarity index 84% rename from src/main/java/refinedstorage/gui/GuiSolderer.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiSolderer.java index 0a647b7b2..2fbc0ae43 100755 --- a/src/main/java/refinedstorage/gui/GuiSolderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiSolderer.java @@ -1,52 +1,52 @@ -package refinedstorage.gui; - -import refinedstorage.container.ContainerSolderer; -import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; -import refinedstorage.tile.TileSolderer; - -public class GuiSolderer extends GuiBase { - public GuiSolderer(ContainerSolderer container) { - super(container, 211, 171); - } - - @Override - public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(this, TileSolderer.REDSTONE_MODE)); - } - - @Override - public void update(int x, int y) { - } - - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) { - bindTexture("gui/solderer.png"); - - drawTexture(x, y, 0, 0, width, height); - - if (TileSolderer.WORKING.getValue()) { - drawTexture(x + 83, y + 38 - 1, 212, 0, getProgressScaled(22), 15); - } - } - - @Override - public void drawForeground(int mouseX, int mouseY) { - drawString(7, 7, t("gui.refinedstorage:solderer")); - drawString(7, 77, t("container.inventory")); - - if (inBounds(83, 38, 22, 15, mouseX, mouseY) && TileSolderer.WORKING.getValue()) { - drawTooltip(mouseX, mouseY, getProgressScaled(100) + "%"); - } - } - - private int getProgressScaled(int scale) { - float progress = TileSolderer.PROGRESS.getValue(); - float duration = TileSolderer.DURATION.getValue(); - - if (progress > duration) { - return scale; - } - - return (int) (progress / duration * (float) scale); - } -} +package com.raoulvdberge.refinedstorage.gui; + +import com.raoulvdberge.refinedstorage.container.ContainerSolderer; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.tile.TileSolderer; + +public class GuiSolderer extends GuiBase { + public GuiSolderer(ContainerSolderer container) { + super(container, 211, 171); + } + + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(this, TileSolderer.REDSTONE_MODE)); + } + + @Override + public void update(int x, int y) { + } + + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/solderer.png"); + + drawTexture(x, y, 0, 0, width, height); + + if (TileSolderer.WORKING.getValue()) { + drawTexture(x + 83, y + 38 - 1, 212, 0, getProgressScaled(22), 15); + } + } + + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:solderer")); + drawString(7, 77, t("container.inventory")); + + if (inBounds(83, 38, 22, 15, mouseX, mouseY) && TileSolderer.WORKING.getValue()) { + drawTooltip(mouseX, mouseY, getProgressScaled(100) + "%"); + } + } + + private int getProgressScaled(int scale) { + float progress = TileSolderer.PROGRESS.getValue(); + float duration = TileSolderer.DURATION.getValue(); + + if (progress > duration) { + return scale; + } + + return (int) (progress / duration * (float) scale); + } +} diff --git a/src/main/java/refinedstorage/gui/GuiStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java similarity index 92% rename from src/main/java/refinedstorage/gui/GuiStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java index 1480e1027..367549f49 100755 --- a/src/main/java/refinedstorage/gui/GuiStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java @@ -1,135 +1,135 @@ -package refinedstorage.gui; - -import com.google.common.primitives.Ints; -import net.minecraft.client.gui.GuiTextField; -import refinedstorage.api.util.IComparer; -import refinedstorage.container.ContainerBase; -import refinedstorage.gui.sidebutton.*; -import refinedstorage.tile.IStorageGui; -import refinedstorage.tile.data.TileDataManager; - -import java.io.IOException; - -public class GuiStorage extends GuiBase { - private IStorageGui gui; - private String texture; - - private GuiTextField priorityField; - - private int barX = 8; - private int barY = 54; - private int barWidth = 16; - private int barHeight = 58; - - public GuiStorage(ContainerBase container, IStorageGui gui, String texture) { - super(container, 176, 211); - - this.gui = gui; - this.texture = texture; - } - - public GuiStorage(ContainerBase container, IStorageGui gui) { - this(container, gui, "gui/storage.png"); - } - - @Override - public void init(int x, int y) { - if (gui.getRedstoneModeParameter() != null) { - addSideButton(new SideButtonRedstoneMode(this, gui.getRedstoneModeParameter())); - } - - if (gui.getTypeParameter() != null) { - addSideButton(new SideButtonType(this, gui.getTypeParameter())); - } - - if (gui.getFilterParameter() != null) { - addSideButton(new SideButtonMode(this, gui.getFilterParameter())); - } - - if (gui.getCompareParameter() != null) { - addSideButton(new SideButtonCompare(this, gui.getCompareParameter(), IComparer.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(this, gui.getCompareParameter(), IComparer.COMPARE_NBT)); - addSideButton(new SideButtonCompare(this, gui.getCompareParameter(), IComparer.COMPARE_OREDICT)); - } - - if (gui.getVoidExcessParameter() != null) { - addSideButton(new SideButtonVoidExcess(this, gui.getVoidExcessParameter(), gui.getVoidExcessType())); - } - - if (gui.getAccessTypeParameter() != null) { - addSideButton(new SideButtonAccessType(this, gui.getAccessTypeParameter())); - } - - priorityField = new GuiTextField(0, fontRendererObj, x + 98 + 1, y + 54 + 1, 29, fontRendererObj.FONT_HEIGHT); - priorityField.setEnableBackgroundDrawing(false); - priorityField.setVisible(true); - priorityField.setTextColor(16777215); - priorityField.setCanLoseFocus(true); - priorityField.setFocused(false); - - updatePriority(gui.getPriorityParameter().getValue()); - } - - @Override - public void update(int x, int y) { - } - - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) { - bindTexture(texture); - - drawTexture(x, y, 0, 0, width, height); - - int barHeightNew = (int) ((float) gui.getStored() / (float) gui.getCapacity() * (float) barHeight); - - drawTexture(x + barX, y + barY + barHeight - barHeightNew, 179, barHeight - barHeightNew, barWidth, barHeightNew); - - priorityField.drawTextBox(); - } - - @Override - public void drawForeground(int mouseX, int mouseY) { - drawString(7, 7, t(gui.getGuiTitle())); - drawString(7, 42, gui.getCapacity() == -1 ? t("misc.refinedstorage:storage.stored_minimal", gui.getStored()) : t("misc.refinedstorage:storage.stored_capacity_minimal", gui.getStored(), gui.getCapacity())); - drawString(97, 42, t("misc.refinedstorage:priority")); - drawString(7, 117, t("container.inventory")); - - if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { - int full = 0; - - if (gui.getCapacity() >= 0) { - full = (int) ((float) gui.getStored() / (float) gui.getCapacity() * 100f); - } - - drawTooltip(mouseX, mouseY, t("misc.refinedstorage:storage.full", full)); - } - } - - @Override - protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { - super.mouseClicked(mouseX, mouseY, mouseButton); - - priorityField.mouseClicked(mouseX, mouseY, mouseButton); - } - - @Override - protected void keyTyped(char character, int keyCode) throws IOException { - if (checkHotbarKeys(keyCode)) { - // NO OP - } else if (priorityField.textboxKeyTyped(character, keyCode)) { - Integer result = Ints.tryParse(priorityField.getText()); - - if (result != null) { - TileDataManager.setParameter(gui.getPriorityParameter(), result); - } - } else { - super.keyTyped(character, keyCode); - } - } - - public void updatePriority(int priority) { - if (priorityField != null) { - priorityField.setText(String.valueOf(priority)); - } - } -} +package com.raoulvdberge.refinedstorage.gui; + +import com.google.common.primitives.Ints; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.container.ContainerBase; +import com.raoulvdberge.refinedstorage.gui.sidebutton.*; +import com.raoulvdberge.refinedstorage.tile.IStorageGui; +import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import net.minecraft.client.gui.GuiTextField; + +import java.io.IOException; + +public class GuiStorage extends GuiBase { + private IStorageGui gui; + private String texture; + + private GuiTextField priorityField; + + private int barX = 8; + private int barY = 54; + private int barWidth = 16; + private int barHeight = 58; + + public GuiStorage(ContainerBase container, IStorageGui gui, String texture) { + super(container, 176, 211); + + this.gui = gui; + this.texture = texture; + } + + public GuiStorage(ContainerBase container, IStorageGui gui) { + this(container, gui, "gui/storage.png"); + } + + @Override + public void init(int x, int y) { + if (gui.getRedstoneModeParameter() != null) { + addSideButton(new SideButtonRedstoneMode(this, gui.getRedstoneModeParameter())); + } + + if (gui.getTypeParameter() != null) { + addSideButton(new SideButtonType(this, gui.getTypeParameter())); + } + + if (gui.getFilterParameter() != null) { + addSideButton(new SideButtonMode(this, gui.getFilterParameter())); + } + + if (gui.getCompareParameter() != null) { + addSideButton(new SideButtonCompare(this, gui.getCompareParameter(), IComparer.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(this, gui.getCompareParameter(), IComparer.COMPARE_NBT)); + addSideButton(new SideButtonCompare(this, gui.getCompareParameter(), IComparer.COMPARE_OREDICT)); + } + + if (gui.getVoidExcessParameter() != null) { + addSideButton(new SideButtonVoidExcess(this, gui.getVoidExcessParameter(), gui.getVoidExcessType())); + } + + if (gui.getAccessTypeParameter() != null) { + addSideButton(new SideButtonAccessType(this, gui.getAccessTypeParameter())); + } + + priorityField = new GuiTextField(0, fontRendererObj, x + 98 + 1, y + 54 + 1, 29, fontRendererObj.FONT_HEIGHT); + priorityField.setEnableBackgroundDrawing(false); + priorityField.setVisible(true); + priorityField.setTextColor(16777215); + priorityField.setCanLoseFocus(true); + priorityField.setFocused(false); + + updatePriority(gui.getPriorityParameter().getValue()); + } + + @Override + public void update(int x, int y) { + } + + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture(texture); + + drawTexture(x, y, 0, 0, width, height); + + int barHeightNew = (int) ((float) gui.getStored() / (float) gui.getCapacity() * (float) barHeight); + + drawTexture(x + barX, y + barY + barHeight - barHeightNew, 179, barHeight - barHeightNew, barWidth, barHeightNew); + + priorityField.drawTextBox(); + } + + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t(gui.getGuiTitle())); + drawString(7, 42, gui.getCapacity() == -1 ? t("misc.refinedstorage:storage.stored_minimal", gui.getStored()) : t("misc.refinedstorage:storage.stored_capacity_minimal", gui.getStored(), gui.getCapacity())); + drawString(97, 42, t("misc.refinedstorage:priority")); + drawString(7, 117, t("container.inventory")); + + if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { + int full = 0; + + if (gui.getCapacity() >= 0) { + full = (int) ((float) gui.getStored() / (float) gui.getCapacity() * 100f); + } + + drawTooltip(mouseX, mouseY, t("misc.refinedstorage:storage.full", full)); + } + } + + @Override + protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { + super.mouseClicked(mouseX, mouseY, mouseButton); + + priorityField.mouseClicked(mouseX, mouseY, mouseButton); + } + + @Override + protected void keyTyped(char character, int keyCode) throws IOException { + if (checkHotbarKeys(keyCode)) { + // NO OP + } else if (priorityField.textboxKeyTyped(character, keyCode)) { + Integer result = Ints.tryParse(priorityField.getText()); + + if (result != null) { + TileDataManager.setParameter(gui.getPriorityParameter(), result); + } + } else { + super.keyTyped(character, keyCode); + } + } + + public void updatePriority(int priority) { + if (priorityField != null) { + priorityField.setText(String.valueOf(priority)); + } + } +} diff --git a/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiWirelessTransmitter.java similarity index 77% rename from src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/GuiWirelessTransmitter.java index 82cc11bab..8e8a3eda0 100755 --- a/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiWirelessTransmitter.java @@ -1,8 +1,8 @@ -package refinedstorage.gui; +package com.raoulvdberge.refinedstorage.gui; -import refinedstorage.container.ContainerWirelessTransmitter; -import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; -import refinedstorage.tile.TileWirelessTransmitter; +import com.raoulvdberge.refinedstorage.container.ContainerWirelessTransmitter; +import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.tile.TileWirelessTransmitter; public class GuiWirelessTransmitter extends GuiBase { public GuiWirelessTransmitter(ContainerWirelessTransmitter container) { diff --git a/src/main/java/refinedstorage/gui/Scrollbar.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/Scrollbar.java similarity index 94% rename from src/main/java/refinedstorage/gui/Scrollbar.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/Scrollbar.java index b82fa0f87..dc2c8c1cc 100755 --- a/src/main/java/refinedstorage/gui/Scrollbar.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/Scrollbar.java @@ -1,94 +1,94 @@ -package refinedstorage.gui; - -import org.lwjgl.input.Mouse; - -public class Scrollbar { - private static final int SCROLLER_HEIGHT = 15; - - private int x; - private int y; - private int width; - private int height; - private boolean enabled = false; - - private int offset; - private int maxOffset; - - private boolean wasClicking = false; - private boolean isScrolling = false; - - public Scrollbar(int x, int y, int width, int height) { - this.x = x; - this.y = y; - this.width = width; - this.height = height; - } - - public int getWidth() { - return width; - } - - public int getHeight() { - return height; - } - - public void setEnabled(boolean enabled) { - this.enabled = enabled; - } - - public boolean isEnabled() { - return enabled; - } - - public void draw(GuiBase gui) { - gui.bindTexture("icons.png"); - gui.drawTexture(gui.getGuiLeft() + x, gui.getGuiTop() + y + (int) Math.min(height - SCROLLER_HEIGHT, (float) offset / (float) maxOffset * (float) (height - SCROLLER_HEIGHT)), isEnabled() ? 232 : 244, 0, 12, 15); - } - - public void update(GuiBase gui, int mouseX, int mouseY) { - if (!isEnabled()) { - isScrolling = false; - wasClicking = false; - } else { - boolean down = Mouse.isButtonDown(0); - - if (!wasClicking && down && gui.inBounds(x, y, width, height, mouseX, mouseY)) { - isScrolling = true; - } - - if (!down) { - isScrolling = false; - } - - wasClicking = down; - - if (isScrolling) { - setOffset((int) Math.floor((float) (mouseY - SCROLLER_HEIGHT) / (float) (height - SCROLLER_HEIGHT) * (float) maxOffset)); - } - } - } - - public void wheel(int delta) { - if (isEnabled()) { - setOffset(offset + Math.max(Math.min(-delta, 1), -1)); - } - } - - public void setMaxOffset(int maxOffset) { - this.maxOffset = maxOffset; - - if (offset > maxOffset) { - this.offset = Math.max(0, maxOffset); - } - } - - public int getOffset() { - return offset; - } - - public void setOffset(int offset) { - if (offset >= 0 && offset <= maxOffset) { - this.offset = offset; - } - } -} +package com.raoulvdberge.refinedstorage.gui; + +import org.lwjgl.input.Mouse; + +public class Scrollbar { + private static final int SCROLLER_HEIGHT = 15; + + private int x; + private int y; + private int width; + private int height; + private boolean enabled = false; + + private int offset; + private int maxOffset; + + private boolean wasClicking = false; + private boolean isScrolling = false; + + public Scrollbar(int x, int y, int width, int height) { + this.x = x; + this.y = y; + this.width = width; + this.height = height; + } + + public int getWidth() { + return width; + } + + public int getHeight() { + return height; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public boolean isEnabled() { + return enabled; + } + + public void draw(GuiBase gui) { + gui.bindTexture("icons.png"); + gui.drawTexture(gui.getGuiLeft() + x, gui.getGuiTop() + y + (int) Math.min(height - SCROLLER_HEIGHT, (float) offset / (float) maxOffset * (float) (height - SCROLLER_HEIGHT)), isEnabled() ? 232 : 244, 0, 12, 15); + } + + public void update(GuiBase gui, int mouseX, int mouseY) { + if (!isEnabled()) { + isScrolling = false; + wasClicking = false; + } else { + boolean down = Mouse.isButtonDown(0); + + if (!wasClicking && down && gui.inBounds(x, y, width, height, mouseX, mouseY)) { + isScrolling = true; + } + + if (!down) { + isScrolling = false; + } + + wasClicking = down; + + if (isScrolling) { + setOffset((int) Math.floor((float) (mouseY - SCROLLER_HEIGHT) / (float) (height - SCROLLER_HEIGHT) * (float) maxOffset)); + } + } + } + + public void wheel(int delta) { + if (isEnabled()) { + setOffset(offset + Math.max(Math.min(-delta, 1), -1)); + } + } + + public void setMaxOffset(int maxOffset) { + this.maxOffset = maxOffset; + + if (offset > maxOffset) { + this.offset = Math.max(0, maxOffset); + } + } + + public int getOffset() { + return offset; + } + + public void setOffset(int offset) { + if (offset >= 0 && offset <= maxOffset) { + this.offset = offset; + } + } +} diff --git a/src/main/java/refinedstorage/gui/config/ModGuiConfig.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiConfig.java similarity index 81% rename from src/main/java/refinedstorage/gui/config/ModGuiConfig.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiConfig.java index d76cd90af..5505b704d 100755 --- a/src/main/java/refinedstorage/gui/config/ModGuiConfig.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiConfig.java @@ -1,8 +1,8 @@ -package refinedstorage.gui.config; +package com.raoulvdberge.refinedstorage.gui.config; +import com.raoulvdberge.refinedstorage.RS; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.fml.client.config.GuiConfig; -import refinedstorage.RS; public class ModGuiConfig extends GuiConfig { diff --git a/src/main/java/refinedstorage/gui/config/ModGuiFactory.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiFactory.java old mode 100644 new mode 100755 similarity index 92% rename from src/main/java/refinedstorage/gui/config/ModGuiFactory.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiFactory.java index bf70e1207..8eb284274 --- a/src/main/java/refinedstorage/gui/config/ModGuiFactory.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiFactory.java @@ -1,4 +1,4 @@ -package refinedstorage.gui.config; +package com.raoulvdberge.refinedstorage.gui.config; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; diff --git a/src/main/java/refinedstorage/gui/grid/GridFilteredItem.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GridFilteredItem.java similarity index 88% rename from src/main/java/refinedstorage/gui/grid/GridFilteredItem.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GridFilteredItem.java index 3e3505850..66205f670 100755 --- a/src/main/java/refinedstorage/gui/grid/GridFilteredItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GridFilteredItem.java @@ -1,4 +1,4 @@ -package refinedstorage.gui.grid; +package com.raoulvdberge.refinedstorage.gui.grid; import net.minecraft.item.ItemStack; diff --git a/src/main/java/refinedstorage/gui/grid/GuiCraftingStart.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiCraftingStart.java similarity index 91% rename from src/main/java/refinedstorage/gui/grid/GuiCraftingStart.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiCraftingStart.java index 56929bebc..11bc8e427 100755 --- a/src/main/java/refinedstorage/gui/grid/GuiCraftingStart.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiCraftingStart.java @@ -1,16 +1,16 @@ -package refinedstorage.gui.grid; +package com.raoulvdberge.refinedstorage.gui.grid; import com.google.common.primitives.Ints; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.container.ContainerCraftingSettings; +import com.raoulvdberge.refinedstorage.gui.GuiBase; +import com.raoulvdberge.refinedstorage.gui.grid.stack.ClientStackItem; +import com.raoulvdberge.refinedstorage.network.MessageGridCraftingPreview; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.client.FMLClientHandler; import org.lwjgl.input.Keyboard; -import refinedstorage.RS; -import refinedstorage.container.ContainerCraftingSettings; -import refinedstorage.gui.GuiBase; -import refinedstorage.gui.grid.stack.ClientStackItem; -import refinedstorage.network.MessageGridCraftingPreview; import java.io.IOException; diff --git a/src/main/java/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java similarity index 93% rename from src/main/java/refinedstorage/gui/grid/GuiGrid.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java index 8c103887e..00c5ad6f3 100755 --- a/src/main/java/refinedstorage/gui/grid/GuiGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java @@ -1,8 +1,26 @@ -package refinedstorage.gui.grid; +package com.raoulvdberge.refinedstorage.gui.grid; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Multimaps; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler; +import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.block.EnumGridType; +import com.raoulvdberge.refinedstorage.container.ContainerGrid; +import com.raoulvdberge.refinedstorage.gui.GuiBase; +import com.raoulvdberge.refinedstorage.gui.Scrollbar; +import com.raoulvdberge.refinedstorage.gui.grid.sorting.GridSortingName; +import com.raoulvdberge.refinedstorage.gui.grid.sorting.GridSortingQuantity; +import com.raoulvdberge.refinedstorage.gui.grid.stack.ClientStackFluid; +import com.raoulvdberge.refinedstorage.gui.grid.stack.ClientStackItem; +import com.raoulvdberge.refinedstorage.gui.grid.stack.IClientStack; +import com.raoulvdberge.refinedstorage.gui.sidebutton.*; +import com.raoulvdberge.refinedstorage.integration.jei.IntegrationJEI; +import com.raoulvdberge.refinedstorage.integration.jei.RSJEIPlugin; +import com.raoulvdberge.refinedstorage.network.*; +import com.raoulvdberge.refinedstorage.tile.grid.IGrid; +import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; @@ -15,24 +33,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fml.common.FMLCommonHandler; import org.lwjgl.input.Keyboard; -import refinedstorage.RS; -import refinedstorage.api.network.grid.IItemGridHandler; -import refinedstorage.apiimpl.API; -import refinedstorage.block.EnumGridType; -import refinedstorage.container.ContainerGrid; -import refinedstorage.gui.GuiBase; -import refinedstorage.gui.Scrollbar; -import refinedstorage.gui.grid.sorting.GridSortingName; -import refinedstorage.gui.grid.sorting.GridSortingQuantity; -import refinedstorage.gui.grid.stack.ClientStackFluid; -import refinedstorage.gui.grid.stack.ClientStackItem; -import refinedstorage.gui.grid.stack.IClientStack; -import refinedstorage.gui.sidebutton.*; -import refinedstorage.integration.jei.IntegrationJEI; -import refinedstorage.integration.jei.RSJEIPlugin; -import refinedstorage.network.*; -import refinedstorage.tile.grid.IGrid; -import refinedstorage.tile.grid.TileGrid; import java.io.IOException; import java.util.*; diff --git a/src/main/java/refinedstorage/gui/grid/sorting/GridSorting.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSorting.java similarity index 67% rename from src/main/java/refinedstorage/gui/grid/sorting/GridSorting.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSorting.java index b67451fe3..d3ccc8c5d 100755 --- a/src/main/java/refinedstorage/gui/grid/sorting/GridSorting.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSorting.java @@ -1,6 +1,6 @@ -package refinedstorage.gui.grid.sorting; +package com.raoulvdberge.refinedstorage.gui.grid.sorting; -import refinedstorage.gui.grid.stack.IClientStack; +import com.raoulvdberge.refinedstorage.gui.grid.stack.IClientStack; import java.util.Comparator; diff --git a/src/main/java/refinedstorage/gui/grid/sorting/GridSortingName.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingName.java similarity index 73% rename from src/main/java/refinedstorage/gui/grid/sorting/GridSortingName.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingName.java index c61701d55..b8b7f2549 100755 --- a/src/main/java/refinedstorage/gui/grid/sorting/GridSortingName.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingName.java @@ -1,7 +1,7 @@ -package refinedstorage.gui.grid.sorting; +package com.raoulvdberge.refinedstorage.gui.grid.sorting; -import refinedstorage.gui.grid.stack.IClientStack; -import refinedstorage.tile.grid.TileGrid; +import com.raoulvdberge.refinedstorage.gui.grid.stack.IClientStack; +import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; public class GridSortingName extends GridSorting { @Override diff --git a/src/main/java/refinedstorage/gui/grid/sorting/GridSortingQuantity.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingQuantity.java similarity index 75% rename from src/main/java/refinedstorage/gui/grid/sorting/GridSortingQuantity.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingQuantity.java index d4b51b287..5f2545197 100755 --- a/src/main/java/refinedstorage/gui/grid/sorting/GridSortingQuantity.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingQuantity.java @@ -1,7 +1,7 @@ -package refinedstorage.gui.grid.sorting; +package com.raoulvdberge.refinedstorage.gui.grid.sorting; -import refinedstorage.gui.grid.stack.IClientStack; -import refinedstorage.tile.grid.TileGrid; +import com.raoulvdberge.refinedstorage.gui.grid.stack.IClientStack; +import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; public class GridSortingQuantity extends GridSorting { @Override diff --git a/src/main/java/refinedstorage/gui/grid/stack/ClientStackFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/ClientStackFluid.java similarity index 89% rename from src/main/java/refinedstorage/gui/grid/stack/ClientStackFluid.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/ClientStackFluid.java index 4eab1860f..378b4ff67 100755 --- a/src/main/java/refinedstorage/gui/grid/stack/ClientStackFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/ClientStackFluid.java @@ -1,9 +1,9 @@ -package refinedstorage.gui.grid.stack; +package com.raoulvdberge.refinedstorage.gui.grid.stack; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.gui.GuiBase; import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.tuple.Pair; -import refinedstorage.RSUtils; -import refinedstorage.gui.GuiBase; public class ClientStackFluid implements IClientStack { private int hash; diff --git a/src/main/java/refinedstorage/gui/grid/stack/ClientStackItem.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/ClientStackItem.java similarity index 96% rename from src/main/java/refinedstorage/gui/grid/stack/ClientStackItem.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/ClientStackItem.java index 08fb9bc0b..6be23c5d4 100755 --- a/src/main/java/refinedstorage/gui/grid/stack/ClientStackItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/ClientStackItem.java @@ -1,5 +1,6 @@ -package refinedstorage.gui.grid.stack; +package com.raoulvdberge.refinedstorage.gui.grid.stack; +import com.raoulvdberge.refinedstorage.gui.GuiBase; import io.netty.buffer.ByteBuf; import joptsimple.internal.Strings; import net.minecraft.client.Minecraft; @@ -8,7 +9,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.common.network.ByteBufUtils; -import refinedstorage.gui.GuiBase; import java.util.List; import java.util.Locale; diff --git a/src/main/java/refinedstorage/gui/grid/stack/IClientStack.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/IClientStack.java similarity index 67% rename from src/main/java/refinedstorage/gui/grid/stack/IClientStack.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/IClientStack.java index 8aae2cc32..bf74fe651 100755 --- a/src/main/java/refinedstorage/gui/grid/stack/IClientStack.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/IClientStack.java @@ -1,6 +1,6 @@ -package refinedstorage.gui.grid.stack; +package com.raoulvdberge.refinedstorage.gui.grid.stack; -import refinedstorage.gui.GuiBase; +import com.raoulvdberge.refinedstorage.gui.GuiBase; public interface IClientStack { int getHash(); diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButton.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButton.java similarity index 91% rename from src/main/java/refinedstorage/gui/sidebutton/SideButton.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButton.java index a970cf252..b250c4eaa 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButton.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButton.java @@ -1,50 +1,50 @@ -package refinedstorage.gui.sidebutton; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.GlStateManager; -import org.lwjgl.opengl.GL11; -import refinedstorage.gui.GuiBase; - -public abstract class SideButton extends GuiButton { - public static final int WIDTH = 18; - public static final int HEIGHT = 18; - - protected GuiBase gui; - - public SideButton(GuiBase gui) { - super(-1, -1, -1, 18, 18, ""); - - this.gui = gui; - } - - public boolean isHovered() { - return hovered; - } - - @Override - public void drawButton(Minecraft mc, int mouseX, int mouseY) { - GlStateManager.enableAlpha(); - - hovered = gui.inBounds(xPosition, yPosition, width, height, mouseX, mouseY); - - gui.bindTexture("icons.png"); - gui.drawTexture(xPosition, yPosition, 238, hovered ? 35 : 16, 18, 18); - - drawButtonIcon(xPosition + 1, yPosition + 1); - - if (hovered) { - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.color(1.0f, 1.0f, 1.0f, 0.5f); - gui.drawTexture(xPosition, yPosition, 238, 54, 18, 18); - GlStateManager.disableBlend(); - } - } - - protected abstract void drawButtonIcon(int x, int y); - - public abstract String getTooltip(); - - public abstract void actionPerformed(); -} +package com.raoulvdberge.refinedstorage.gui.sidebutton; + +import com.raoulvdberge.refinedstorage.gui.GuiBase; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.GlStateManager; +import org.lwjgl.opengl.GL11; + +public abstract class SideButton extends GuiButton { + public static final int WIDTH = 18; + public static final int HEIGHT = 18; + + protected GuiBase gui; + + public SideButton(GuiBase gui) { + super(-1, -1, -1, 18, 18, ""); + + this.gui = gui; + } + + public boolean isHovered() { + return hovered; + } + + @Override + public void drawButton(Minecraft mc, int mouseX, int mouseY) { + GlStateManager.enableAlpha(); + + hovered = gui.inBounds(xPosition, yPosition, width, height, mouseX, mouseY); + + gui.bindTexture("icons.png"); + gui.drawTexture(xPosition, yPosition, 238, hovered ? 35 : 16, 18, 18); + + drawButtonIcon(xPosition + 1, yPosition + 1); + + if (hovered) { + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1.0f, 1.0f, 1.0f, 0.5f); + gui.drawTexture(xPosition, yPosition, 238, 54, 18, 18); + GlStateManager.disableBlend(); + } + } + + protected abstract void drawButtonIcon(int x, int y); + + public abstract String getTooltip(); + + public abstract void actionPerformed(); +} diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonAccessType.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonAccessType.java similarity index 69% rename from src/main/java/refinedstorage/gui/sidebutton/SideButtonAccessType.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonAccessType.java index dca879ede..09e108e77 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonAccessType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonAccessType.java @@ -1,11 +1,11 @@ -package refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.sidebutton; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.gui.GuiBase; +import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.util.text.TextFormatting; -import refinedstorage.RSUtils; -import refinedstorage.api.storage.AccessType; -import refinedstorage.gui.GuiBase; -import refinedstorage.tile.data.TileDataManager; -import refinedstorage.tile.data.TileDataParameter; public class SideButtonAccessType extends SideButton { private TileDataParameter parameter; diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonCompare.java similarity index 80% rename from src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonCompare.java index d02c0980a..e6513053b 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonCompare.java @@ -1,52 +1,52 @@ -package refinedstorage.gui.sidebutton; - -import net.minecraft.util.text.TextFormatting; -import refinedstorage.api.util.IComparer; -import refinedstorage.gui.GuiBase; -import refinedstorage.tile.data.TileDataManager; -import refinedstorage.tile.data.TileDataParameter; - -public class SideButtonCompare extends SideButton { - private TileDataParameter parameter; - private int mask; - - public SideButtonCompare(GuiBase gui, TileDataParameter parameter, int mask) { - super(gui); - - this.parameter = parameter; - this.mask = mask; - } - - @Override - public String getTooltip() { - String tooltip = TextFormatting.YELLOW + GuiBase.t("sidebutton.refinedstorage:compare." + mask) + TextFormatting.RESET + "\n"; - - if ((parameter.getValue() & mask) == mask) { - tooltip += GuiBase.t("gui.yes"); - } else { - tooltip += GuiBase.t("gui.no"); - } - - return tooltip; - } - - @Override - protected void drawButtonIcon(int x, int y) { - int ty = 0; - - if (mask == IComparer.COMPARE_DAMAGE) { - ty = 80; - } else if (mask == IComparer.COMPARE_NBT) { - ty = 48; - } - - int tx = (parameter.getValue() & mask) == mask ? 0 : 16; - - gui.drawTexture(x, y, tx, ty, 16, 16); - } - - @Override - public void actionPerformed() { - TileDataManager.setParameter(parameter, parameter.getValue() ^ mask); - } -} +package com.raoulvdberge.refinedstorage.gui.sidebutton; + +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.gui.GuiBase; +import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import net.minecraft.util.text.TextFormatting; + +public class SideButtonCompare extends SideButton { + private TileDataParameter parameter; + private int mask; + + public SideButtonCompare(GuiBase gui, TileDataParameter parameter, int mask) { + super(gui); + + this.parameter = parameter; + this.mask = mask; + } + + @Override + public String getTooltip() { + String tooltip = TextFormatting.YELLOW + GuiBase.t("sidebutton.refinedstorage:compare." + mask) + TextFormatting.RESET + "\n"; + + if ((parameter.getValue() & mask) == mask) { + tooltip += GuiBase.t("gui.yes"); + } else { + tooltip += GuiBase.t("gui.no"); + } + + return tooltip; + } + + @Override + protected void drawButtonIcon(int x, int y) { + int ty = 0; + + if (mask == IComparer.COMPARE_DAMAGE) { + ty = 80; + } else if (mask == IComparer.COMPARE_NBT) { + ty = 48; + } + + int tx = (parameter.getValue() & mask) == mask ? 0 : 16; + + gui.drawTexture(x, y, tx, ty, 16, 16); + } + + @Override + public void actionPerformed() { + TileDataManager.setParameter(parameter, parameter.getValue() ^ mask); + } +} diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonConstuctorDrop.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonConstuctorDrop.java similarity index 73% rename from src/main/java/refinedstorage/gui/sidebutton/SideButtonConstuctorDrop.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonConstuctorDrop.java index 26885c263..94b60a903 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonConstuctorDrop.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonConstuctorDrop.java @@ -1,9 +1,9 @@ -package refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.sidebutton; +import com.raoulvdberge.refinedstorage.gui.GuiBase; +import com.raoulvdberge.refinedstorage.tile.TileConstructor; +import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import net.minecraft.util.text.TextFormatting; -import refinedstorage.gui.GuiBase; -import refinedstorage.tile.TileConstructor; -import refinedstorage.tile.data.TileDataManager; public class SideButtonConstuctorDrop extends SideButton { public SideButtonConstuctorDrop(GuiBase gui) { diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCrafterTriggeredAutocrafting.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonCrafterTriggeredAutocrafting.java similarity index 78% rename from src/main/java/refinedstorage/gui/sidebutton/SideButtonCrafterTriggeredAutocrafting.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonCrafterTriggeredAutocrafting.java index dd3a77285..98c8faed3 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCrafterTriggeredAutocrafting.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonCrafterTriggeredAutocrafting.java @@ -1,9 +1,9 @@ -package refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.sidebutton; +import com.raoulvdberge.refinedstorage.gui.GuiBase; +import com.raoulvdberge.refinedstorage.tile.TileCrafter; +import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import net.minecraft.util.text.TextFormatting; -import refinedstorage.gui.GuiBase; -import refinedstorage.tile.TileCrafter; -import refinedstorage.tile.data.TileDataManager; public class SideButtonCrafterTriggeredAutocrafting extends SideButton { public SideButtonCrafterTriggeredAutocrafting(GuiBase gui) { diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java similarity index 83% rename from src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java index 0719863cc..eb8c7c609 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java @@ -1,39 +1,39 @@ -package refinedstorage.gui.sidebutton; - -import net.minecraft.util.text.TextFormatting; -import refinedstorage.gui.GuiBase; -import refinedstorage.tile.TileDetector; -import refinedstorage.tile.data.TileDataManager; - -public class SideButtonDetectorMode extends SideButton { - public SideButtonDetectorMode(GuiBase gui) { - super(gui); - } - - @Override - public String getTooltip() { - return TextFormatting.GREEN + GuiBase.t("sidebutton.refinedstorage:detector.mode") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:detector.mode." + TileDetector.MODE.getValue()); - } - - @Override - protected void drawButtonIcon(int x, int y) { - gui.drawTexture(x, y, TileDetector.MODE.getValue() * 16, 176, 16, 16); - } - - @Override - public void actionPerformed() { - int mode = TileDetector.MODE.getValue(); - - if (mode == TileDetector.MODE_EQUAL) { - mode = TileDetector.MODE_ABOVE; - } else if (mode == TileDetector.MODE_ABOVE) { - mode = TileDetector.MODE_UNDER; - } else if (mode == TileDetector.MODE_UNDER) { - mode = TileDetector.MODE_AUTOCRAFTING; - } else if (mode == TileDetector.MODE_AUTOCRAFTING) { - mode = TileDetector.MODE_EQUAL; - } - - TileDataManager.setParameter(TileDetector.MODE, mode); - } -} +package com.raoulvdberge.refinedstorage.gui.sidebutton; + +import com.raoulvdberge.refinedstorage.gui.GuiBase; +import com.raoulvdberge.refinedstorage.tile.TileDetector; +import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import net.minecraft.util.text.TextFormatting; + +public class SideButtonDetectorMode extends SideButton { + public SideButtonDetectorMode(GuiBase gui) { + super(gui); + } + + @Override + public String getTooltip() { + return TextFormatting.GREEN + GuiBase.t("sidebutton.refinedstorage:detector.mode") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:detector.mode." + TileDetector.MODE.getValue()); + } + + @Override + protected void drawButtonIcon(int x, int y) { + gui.drawTexture(x, y, TileDetector.MODE.getValue() * 16, 176, 16, 16); + } + + @Override + public void actionPerformed() { + int mode = TileDetector.MODE.getValue(); + + if (mode == TileDetector.MODE_EQUAL) { + mode = TileDetector.MODE_ABOVE; + } else if (mode == TileDetector.MODE_ABOVE) { + mode = TileDetector.MODE_UNDER; + } else if (mode == TileDetector.MODE_UNDER) { + mode = TileDetector.MODE_AUTOCRAFTING; + } else if (mode == TileDetector.MODE_AUTOCRAFTING) { + mode = TileDetector.MODE_EQUAL; + } + + TileDataManager.setParameter(TileDetector.MODE, mode); + } +} diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java similarity index 85% rename from src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java index 031a82fc3..3c136c5c5 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java @@ -1,10 +1,10 @@ -package refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.sidebutton; +import com.raoulvdberge.refinedstorage.gui.GuiBase; +import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid; +import com.raoulvdberge.refinedstorage.integration.jei.IntegrationJEI; +import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; import net.minecraft.util.text.TextFormatting; -import refinedstorage.gui.GuiBase; -import refinedstorage.gui.grid.GuiGrid; -import refinedstorage.integration.jei.IntegrationJEI; -import refinedstorage.tile.grid.TileGrid; public class SideButtonGridSearchBoxMode extends SideButton { public SideButtonGridSearchBoxMode(GuiGrid gui) { diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java similarity index 83% rename from src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java index efb0f5fb6..76d51d2dc 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java @@ -1,39 +1,39 @@ -package refinedstorage.gui.sidebutton; - -import net.minecraft.util.text.TextFormatting; -import refinedstorage.gui.GuiBase; -import refinedstorage.tile.grid.IGrid; -import refinedstorage.tile.grid.TileGrid; - -public class SideButtonGridSortingDirection extends SideButton { - private IGrid grid; - - public SideButtonGridSortingDirection(GuiBase gui, IGrid grid) { - super(gui); - - this.grid = grid; - } - - @Override - public String getTooltip() { - return TextFormatting.YELLOW + GuiBase.t("sidebutton.refinedstorage:grid.sorting.direction") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:grid.sorting.direction." + grid.getSortingDirection()); - } - - @Override - protected void drawButtonIcon(int x, int y) { - gui.drawTexture(x, y, grid.getSortingDirection() * 16, 16, 16, 16); - } - - @Override - public void actionPerformed() { - int dir = grid.getSortingDirection(); - - if (dir == TileGrid.SORTING_DIRECTION_ASCENDING) { - dir = TileGrid.SORTING_DIRECTION_DESCENDING; - } else if (dir == TileGrid.SORTING_DIRECTION_DESCENDING) { - dir = TileGrid.SORTING_DIRECTION_ASCENDING; - } - - grid.onSortingDirectionChanged(dir); - } -} +package com.raoulvdberge.refinedstorage.gui.sidebutton; + +import com.raoulvdberge.refinedstorage.gui.GuiBase; +import com.raoulvdberge.refinedstorage.tile.grid.IGrid; +import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; +import net.minecraft.util.text.TextFormatting; + +public class SideButtonGridSortingDirection extends SideButton { + private IGrid grid; + + public SideButtonGridSortingDirection(GuiBase gui, IGrid grid) { + super(gui); + + this.grid = grid; + } + + @Override + public String getTooltip() { + return TextFormatting.YELLOW + GuiBase.t("sidebutton.refinedstorage:grid.sorting.direction") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:grid.sorting.direction." + grid.getSortingDirection()); + } + + @Override + protected void drawButtonIcon(int x, int y) { + gui.drawTexture(x, y, grid.getSortingDirection() * 16, 16, 16, 16); + } + + @Override + public void actionPerformed() { + int dir = grid.getSortingDirection(); + + if (dir == TileGrid.SORTING_DIRECTION_ASCENDING) { + dir = TileGrid.SORTING_DIRECTION_DESCENDING; + } else if (dir == TileGrid.SORTING_DIRECTION_DESCENDING) { + dir = TileGrid.SORTING_DIRECTION_ASCENDING; + } + + grid.onSortingDirectionChanged(dir); + } +} diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java similarity index 82% rename from src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java index a4df14c1a..5979bffb7 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java @@ -1,39 +1,39 @@ -package refinedstorage.gui.sidebutton; - -import net.minecraft.util.text.TextFormatting; -import refinedstorage.gui.GuiBase; -import refinedstorage.tile.grid.IGrid; -import refinedstorage.tile.grid.TileGrid; - -public class SideButtonGridSortingType extends SideButton { - private IGrid grid; - - public SideButtonGridSortingType(GuiBase gui, IGrid grid) { - super(gui); - - this.grid = grid; - } - - @Override - public String getTooltip() { - return TextFormatting.YELLOW + GuiBase.t("sidebutton.refinedstorage:grid.sorting.type") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:grid.sorting.type." + grid.getSortingType()); - } - - @Override - protected void drawButtonIcon(int x, int y) { - gui.drawTexture(x, y, grid.getSortingType() * 16, 32, 16, 16); - } - - @Override - public void actionPerformed() { - int type = grid.getSortingType(); - - if (type == TileGrid.SORTING_TYPE_QUANTITY) { - type = TileGrid.SORTING_TYPE_NAME; - } else if (type == TileGrid.SORTING_TYPE_NAME) { - type = TileGrid.SORTING_TYPE_QUANTITY; - } - - grid.onSortingTypeChanged(type); - } -} +package com.raoulvdberge.refinedstorage.gui.sidebutton; + +import com.raoulvdberge.refinedstorage.gui.GuiBase; +import com.raoulvdberge.refinedstorage.tile.grid.IGrid; +import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; +import net.minecraft.util.text.TextFormatting; + +public class SideButtonGridSortingType extends SideButton { + private IGrid grid; + + public SideButtonGridSortingType(GuiBase gui, IGrid grid) { + super(gui); + + this.grid = grid; + } + + @Override + public String getTooltip() { + return TextFormatting.YELLOW + GuiBase.t("sidebutton.refinedstorage:grid.sorting.type") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:grid.sorting.type." + grid.getSortingType()); + } + + @Override + protected void drawButtonIcon(int x, int y) { + gui.drawTexture(x, y, grid.getSortingType() * 16, 32, 16, 16); + } + + @Override + public void actionPerformed() { + int type = grid.getSortingType(); + + if (type == TileGrid.SORTING_TYPE_QUANTITY) { + type = TileGrid.SORTING_TYPE_NAME; + } else if (type == TileGrid.SORTING_TYPE_NAME) { + type = TileGrid.SORTING_TYPE_QUANTITY; + } + + grid.onSortingTypeChanged(type); + } +} diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridViewType.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridViewType.java similarity index 83% rename from src/main/java/refinedstorage/gui/sidebutton/SideButtonGridViewType.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridViewType.java index 8a3ec0ecd..ef5e09e40 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridViewType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridViewType.java @@ -1,9 +1,9 @@ -package refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.sidebutton; +import com.raoulvdberge.refinedstorage.gui.GuiBase; +import com.raoulvdberge.refinedstorage.tile.grid.IGrid; +import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; import net.minecraft.util.text.TextFormatting; -import refinedstorage.gui.GuiBase; -import refinedstorage.tile.grid.IGrid; -import refinedstorage.tile.grid.TileGrid; public class SideButtonGridViewType extends SideButton { private IGrid grid; diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonIOMode.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonIOMode.java similarity index 76% rename from src/main/java/refinedstorage/gui/sidebutton/SideButtonIOMode.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonIOMode.java index 534e16547..9b0900495 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonIOMode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonIOMode.java @@ -1,10 +1,10 @@ -package refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.sidebutton; +import com.raoulvdberge.refinedstorage.gui.GuiBase; +import com.raoulvdberge.refinedstorage.tile.TileDiskManipulator; +import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.util.text.TextFormatting; -import refinedstorage.gui.GuiBase; -import refinedstorage.tile.TileDiskManipulator; -import refinedstorage.tile.data.TileDataManager; -import refinedstorage.tile.data.TileDataParameter; public class SideButtonIOMode extends SideButton { private TileDataParameter parameter; diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonMode.java similarity index 75% rename from src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonMode.java index f1330aa39..a8546dccf 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonMode.java @@ -1,32 +1,32 @@ -package refinedstorage.gui.sidebutton; - -import net.minecraft.util.text.TextFormatting; -import refinedstorage.gui.GuiBase; -import refinedstorage.tile.config.IFilterable; -import refinedstorage.tile.data.TileDataManager; -import refinedstorage.tile.data.TileDataParameter; - -public class SideButtonMode extends SideButton { - private TileDataParameter parameter; - - public SideButtonMode(GuiBase gui, TileDataParameter parameter) { - super(gui); - - this.parameter = parameter; - } - - @Override - public String getTooltip() { - return TextFormatting.GREEN + GuiBase.t("sidebutton.refinedstorage:mode") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:mode." + (parameter.getValue() == IFilterable.WHITELIST ? "whitelist" : "blacklist")); - } - - @Override - protected void drawButtonIcon(int x, int y) { - gui.drawTexture(x, y, parameter.getValue() == IFilterable.WHITELIST ? 0 : 16, 64, 16, 16); - } - - @Override - public void actionPerformed() { - TileDataManager.setParameter(parameter, parameter.getValue() == IFilterable.WHITELIST ? IFilterable.BLACKLIST : IFilterable.WHITELIST); - } -} +package com.raoulvdberge.refinedstorage.gui.sidebutton; + +import com.raoulvdberge.refinedstorage.gui.GuiBase; +import com.raoulvdberge.refinedstorage.tile.config.IFilterable; +import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import net.minecraft.util.text.TextFormatting; + +public class SideButtonMode extends SideButton { + private TileDataParameter parameter; + + public SideButtonMode(GuiBase gui, TileDataParameter parameter) { + super(gui); + + this.parameter = parameter; + } + + @Override + public String getTooltip() { + return TextFormatting.GREEN + GuiBase.t("sidebutton.refinedstorage:mode") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:mode." + (parameter.getValue() == IFilterable.WHITELIST ? "whitelist" : "blacklist")); + } + + @Override + protected void drawButtonIcon(int x, int y) { + gui.drawTexture(x, y, parameter.getValue() == IFilterable.WHITELIST ? 0 : 16, 64, 16, 16); + } + + @Override + public void actionPerformed() { + TileDataManager.setParameter(parameter, parameter.getValue() == IFilterable.WHITELIST ? IFilterable.BLACKLIST : IFilterable.WHITELIST); + } +} diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonPickup.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonPickup.java old mode 100644 new mode 100755 similarity index 73% rename from src/main/java/refinedstorage/gui/sidebutton/SideButtonPickup.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonPickup.java index 3ca1bdefb..68ef698b3 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonPickup.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonPickup.java @@ -1,9 +1,9 @@ -package refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.sidebutton; +import com.raoulvdberge.refinedstorage.gui.GuiBase; +import com.raoulvdberge.refinedstorage.tile.TileDestructor; +import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import net.minecraft.util.text.TextFormatting; -import refinedstorage.gui.GuiBase; -import refinedstorage.tile.TileDestructor; -import refinedstorage.tile.data.TileDataManager; public class SideButtonPickup extends SideButton { public SideButtonPickup(GuiBase gui) { diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java similarity index 77% rename from src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java index 3c3eb0a53..57fb3949f 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java @@ -1,31 +1,31 @@ -package refinedstorage.gui.sidebutton; - -import net.minecraft.util.text.TextFormatting; -import refinedstorage.gui.GuiBase; -import refinedstorage.tile.data.TileDataManager; -import refinedstorage.tile.data.TileDataParameter; - -public class SideButtonRedstoneMode extends SideButton { - private TileDataParameter parameter; - - public SideButtonRedstoneMode(GuiBase gui, TileDataParameter parameter) { - super(gui); - - this.parameter = parameter; - } - - @Override - public String getTooltip() { - return TextFormatting.RED + GuiBase.t("sidebutton.refinedstorage:redstone_mode") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:redstone_mode." + parameter.getValue()); - } - - @Override - protected void drawButtonIcon(int x, int y) { - gui.drawTexture(x, y, parameter.getValue() * 16, 0, 16, 16); - } - - @Override - public void actionPerformed() { - TileDataManager.setParameter(parameter, parameter.getValue() + 1); - } -} +package com.raoulvdberge.refinedstorage.gui.sidebutton; + +import com.raoulvdberge.refinedstorage.gui.GuiBase; +import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import net.minecraft.util.text.TextFormatting; + +public class SideButtonRedstoneMode extends SideButton { + private TileDataParameter parameter; + + public SideButtonRedstoneMode(GuiBase gui, TileDataParameter parameter) { + super(gui); + + this.parameter = parameter; + } + + @Override + public String getTooltip() { + return TextFormatting.RED + GuiBase.t("sidebutton.refinedstorage:redstone_mode") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:redstone_mode." + parameter.getValue()); + } + + @Override + protected void drawButtonIcon(int x, int y) { + gui.drawTexture(x, y, parameter.getValue() * 16, 0, 16, 16); + } + + @Override + public void actionPerformed() { + TileDataManager.setParameter(parameter, parameter.getValue() + 1); + } +} diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonType.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonType.java similarity index 72% rename from src/main/java/refinedstorage/gui/sidebutton/SideButtonType.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonType.java index 7f906015f..b4ce0ad9b 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonType.java @@ -1,10 +1,10 @@ -package refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.sidebutton; +import com.raoulvdberge.refinedstorage.gui.GuiBase; +import com.raoulvdberge.refinedstorage.tile.config.IType; +import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.util.text.TextFormatting; -import refinedstorage.gui.GuiBase; -import refinedstorage.tile.config.IType; -import refinedstorage.tile.data.TileDataManager; -import refinedstorage.tile.data.TileDataParameter; public class SideButtonType extends SideButton { private TileDataParameter type; diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonVoidExcess.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonVoidExcess.java similarity index 78% rename from src/main/java/refinedstorage/gui/sidebutton/SideButtonVoidExcess.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonVoidExcess.java index b5b349007..6d9d187fe 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonVoidExcess.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonVoidExcess.java @@ -1,33 +1,33 @@ -package refinedstorage.gui.sidebutton; - -import net.minecraft.util.text.TextFormatting; -import refinedstorage.gui.GuiBase; -import refinedstorage.tile.data.TileDataManager; -import refinedstorage.tile.data.TileDataParameter; - -public class SideButtonVoidExcess extends SideButton { - private TileDataParameter parameter; - private String type; - - public SideButtonVoidExcess(GuiBase gui, TileDataParameter parameter, String type) { - super(gui); - - this.parameter = parameter; - this.type = type; - } - - @Override - public String getTooltip() { - return TextFormatting.LIGHT_PURPLE + GuiBase.t("sidebutton.refinedstorage:void_excess." + type) + TextFormatting.RESET + "\n" + GuiBase.t(parameter.getValue() ? "gui.yes" : "gui.no"); - } - - @Override - protected void drawButtonIcon(int x, int y) { - gui.drawTexture(x, y, parameter.getValue() ? 16 : 0, 192, 16, 16); - } - - @Override - public void actionPerformed() { - TileDataManager.setParameter(parameter, !parameter.getValue()); - } -} +package com.raoulvdberge.refinedstorage.gui.sidebutton; + +import com.raoulvdberge.refinedstorage.gui.GuiBase; +import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import net.minecraft.util.text.TextFormatting; + +public class SideButtonVoidExcess extends SideButton { + private TileDataParameter parameter; + private String type; + + public SideButtonVoidExcess(GuiBase gui, TileDataParameter parameter, String type) { + super(gui); + + this.parameter = parameter; + this.type = type; + } + + @Override + public String getTooltip() { + return TextFormatting.LIGHT_PURPLE + GuiBase.t("sidebutton.refinedstorage:void_excess." + type) + TextFormatting.RESET + "\n" + GuiBase.t(parameter.getValue() ? "gui.yes" : "gui.no"); + } + + @Override + protected void drawButtonIcon(int x, int y) { + gui.drawTexture(x, y, parameter.getValue() ? 16 : 0, 192, 16, 16); + } + + @Override + public void actionPerformed() { + TileDataManager.setParameter(parameter, !parameter.getValue()); + } +} diff --git a/src/main/java/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java similarity index 84% rename from src/main/java/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java rename to src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java index 9cafec538..451c66857 100755 --- a/src/main/java/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java @@ -1,11 +1,11 @@ -package refinedstorage.integration.craftingtweaks; +package com.raoulvdberge.refinedstorage.integration.craftingtweaks; import com.google.common.base.Function; +import com.raoulvdberge.refinedstorage.block.EnumGridType; +import com.raoulvdberge.refinedstorage.container.ContainerGrid; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.event.FMLInterModComms; -import refinedstorage.block.EnumGridType; -import refinedstorage.container.ContainerGrid; public final class IntegrationCraftingTweaks { private static final String ID = "craftingtweaks"; diff --git a/src/main/java/refinedstorage/integration/forgeenergy/ControllerEnergyForge.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/ControllerEnergyForge.java similarity index 88% rename from src/main/java/refinedstorage/integration/forgeenergy/ControllerEnergyForge.java rename to src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/ControllerEnergyForge.java index a6a31f2e7..a0ad337ad 100755 --- a/src/main/java/refinedstorage/integration/forgeenergy/ControllerEnergyForge.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/ControllerEnergyForge.java @@ -1,7 +1,7 @@ -package refinedstorage.integration.forgeenergy; +package com.raoulvdberge.refinedstorage.integration.forgeenergy; +import com.raoulvdberge.refinedstorage.tile.TileController; import net.minecraftforge.energy.IEnergyStorage; -import refinedstorage.tile.TileController; public class ControllerEnergyForge implements IEnergyStorage { private TileController controller; diff --git a/src/main/java/refinedstorage/integration/forgeenergy/WirelessGridEnergyForge.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/WirelessGridEnergyForge.java similarity index 89% rename from src/main/java/refinedstorage/integration/forgeenergy/WirelessGridEnergyForge.java rename to src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/WirelessGridEnergyForge.java index f3ac74cb9..0e2dcbc30 100755 --- a/src/main/java/refinedstorage/integration/forgeenergy/WirelessGridEnergyForge.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/WirelessGridEnergyForge.java @@ -1,8 +1,8 @@ -package refinedstorage.integration.forgeenergy; +package com.raoulvdberge.refinedstorage.integration.forgeenergy; +import com.raoulvdberge.refinedstorage.RSItems; import net.minecraft.item.ItemStack; import net.minecraftforge.energy.IEnergyStorage; -import refinedstorage.RSItems; public class WirelessGridEnergyForge implements IEnergyStorage { private ItemStack stack; diff --git a/src/main/java/refinedstorage/integration/ic2/ControllerEnergyIC2.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/ic2/ControllerEnergyIC2.java similarity index 90% rename from src/main/java/refinedstorage/integration/ic2/ControllerEnergyIC2.java rename to src/main/java/com/raoulvdberge/refinedstorage/integration/ic2/ControllerEnergyIC2.java index 129b5af60..6572917c5 100755 --- a/src/main/java/refinedstorage/integration/ic2/ControllerEnergyIC2.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/ic2/ControllerEnergyIC2.java @@ -1,8 +1,8 @@ -package refinedstorage.integration.ic2; +package com.raoulvdberge.refinedstorage.integration.ic2; +import com.raoulvdberge.refinedstorage.tile.TileController; import ic2.api.energy.prefab.BasicSink; import net.minecraft.util.EnumFacing; -import refinedstorage.tile.TileController; public class ControllerEnergyIC2 implements IControllerEnergyIC2 { private BasicSink sink; diff --git a/src/main/java/refinedstorage/integration/ic2/ControllerEnergyIC2None.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/ic2/ControllerEnergyIC2None.java similarity index 80% rename from src/main/java/refinedstorage/integration/ic2/ControllerEnergyIC2None.java rename to src/main/java/com/raoulvdberge/refinedstorage/integration/ic2/ControllerEnergyIC2None.java index 211f597e0..b115b9c85 100755 --- a/src/main/java/refinedstorage/integration/ic2/ControllerEnergyIC2None.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/ic2/ControllerEnergyIC2None.java @@ -1,4 +1,4 @@ -package refinedstorage.integration.ic2; +package com.raoulvdberge.refinedstorage.integration.ic2; public class ControllerEnergyIC2None implements IControllerEnergyIC2 { @Override diff --git a/src/main/java/refinedstorage/integration/ic2/IControllerEnergyIC2.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/ic2/IControllerEnergyIC2.java similarity index 66% rename from src/main/java/refinedstorage/integration/ic2/IControllerEnergyIC2.java rename to src/main/java/com/raoulvdberge/refinedstorage/integration/ic2/IControllerEnergyIC2.java index 3ef9d0761..c6193da9e 100755 --- a/src/main/java/refinedstorage/integration/ic2/IControllerEnergyIC2.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/ic2/IControllerEnergyIC2.java @@ -1,4 +1,4 @@ -package refinedstorage.integration.ic2; +package com.raoulvdberge.refinedstorage.integration.ic2; public interface IControllerEnergyIC2 { void invalidate(); diff --git a/src/main/java/refinedstorage/integration/ic2/IntegrationIC2.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/ic2/IntegrationIC2.java similarity index 82% rename from src/main/java/refinedstorage/integration/ic2/IntegrationIC2.java rename to src/main/java/com/raoulvdberge/refinedstorage/integration/ic2/IntegrationIC2.java index 740e1ba75..0e8ae07d3 100755 --- a/src/main/java/refinedstorage/integration/ic2/IntegrationIC2.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/ic2/IntegrationIC2.java @@ -1,7 +1,7 @@ -package refinedstorage.integration.ic2; +package com.raoulvdberge.refinedstorage.integration.ic2; +import com.raoulvdberge.refinedstorage.RS; import net.minecraftforge.fml.common.Loader; -import refinedstorage.RS; public final class IntegrationIC2 { diff --git a/src/main/java/refinedstorage/integration/jei/IntegrationJEI.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/IntegrationJEI.java similarity index 75% rename from src/main/java/refinedstorage/integration/jei/IntegrationJEI.java rename to src/main/java/com/raoulvdberge/refinedstorage/integration/jei/IntegrationJEI.java index 31477a585..86cf8e590 100755 --- a/src/main/java/refinedstorage/integration/jei/IntegrationJEI.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/IntegrationJEI.java @@ -1,4 +1,4 @@ -package refinedstorage.integration.jei; +package com.raoulvdberge.refinedstorage.integration.jei; import net.minecraftforge.fml.common.Loader; diff --git a/src/main/java/refinedstorage/integration/jei/RSJEIPlugin.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJEIPlugin.java similarity index 88% rename from src/main/java/refinedstorage/integration/jei/RSJEIPlugin.java rename to src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJEIPlugin.java index fd483b9c9..718bd58b2 100755 --- a/src/main/java/refinedstorage/integration/jei/RSJEIPlugin.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJEIPlugin.java @@ -1,12 +1,12 @@ -package refinedstorage.integration.jei; +package com.raoulvdberge.refinedstorage.integration.jei; +import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.container.ContainerSolderer; import mezz.jei.api.BlankModPlugin; import mezz.jei.api.IJeiRuntime; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; import net.minecraft.item.ItemStack; -import refinedstorage.RSBlocks; -import refinedstorage.container.ContainerSolderer; @JEIPlugin public class RSJEIPlugin extends BlankModPlugin { diff --git a/src/main/java/refinedstorage/integration/jei/RecipeCategorySolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeCategorySolderer.java similarity index 97% rename from src/main/java/refinedstorage/integration/jei/RecipeCategorySolderer.java rename to src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeCategorySolderer.java index eea8790e7..2306e0b9e 100755 --- a/src/main/java/refinedstorage/integration/jei/RecipeCategorySolderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeCategorySolderer.java @@ -1,4 +1,4 @@ -package refinedstorage.integration.jei; +package com.raoulvdberge.refinedstorage.integration.jei; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; diff --git a/src/main/java/refinedstorage/integration/jei/RecipeHandlerSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeHandlerSolderer.java similarity index 94% rename from src/main/java/refinedstorage/integration/jei/RecipeHandlerSolderer.java rename to src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeHandlerSolderer.java index f6d574d20..a54f0d41d 100755 --- a/src/main/java/refinedstorage/integration/jei/RecipeHandlerSolderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeHandlerSolderer.java @@ -1,4 +1,4 @@ -package refinedstorage.integration.jei; +package com.raoulvdberge.refinedstorage.integration.jei; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/refinedstorage/integration/jei/RecipeMakerSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeMakerSolderer.java similarity index 79% rename from src/main/java/refinedstorage/integration/jei/RecipeMakerSolderer.java rename to src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeMakerSolderer.java index ee09d2533..c956ed2ae 100755 --- a/src/main/java/refinedstorage/integration/jei/RecipeMakerSolderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeMakerSolderer.java @@ -1,8 +1,8 @@ -package refinedstorage.integration.jei; +package com.raoulvdberge.refinedstorage.integration.jei; +import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRecipe; +import com.raoulvdberge.refinedstorage.apiimpl.API; import net.minecraft.item.ItemStack; -import refinedstorage.api.solderer.ISoldererRecipe; -import refinedstorage.apiimpl.API; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java similarity index 91% rename from src/main/java/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java rename to src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java index d3f5154f3..3cf7be497 100755 --- a/src/main/java/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java @@ -1,5 +1,8 @@ -package refinedstorage.integration.jei; +package com.raoulvdberge.refinedstorage.integration.jei; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.container.ContainerGrid; +import com.raoulvdberge.refinedstorage.network.MessageGridCraftingTransfer; import mezz.jei.api.gui.IGuiIngredient; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.transfer.IRecipeTransferError; @@ -11,9 +14,6 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import refinedstorage.RS; -import refinedstorage.container.ContainerGrid; -import refinedstorage.network.MessageGridCraftingTransfer; import java.util.List; import java.util.Map; diff --git a/src/main/java/refinedstorage/integration/jei/RecipeTransferHandlerPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerPattern.java similarity index 87% rename from src/main/java/refinedstorage/integration/jei/RecipeTransferHandlerPattern.java rename to src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerPattern.java index d73f1b810..29faf6daf 100755 --- a/src/main/java/refinedstorage/integration/jei/RecipeTransferHandlerPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerPattern.java @@ -1,15 +1,15 @@ -package refinedstorage.integration.jei; +package com.raoulvdberge.refinedstorage.integration.jei; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.container.ContainerProcessingPatternEncoder; +import com.raoulvdberge.refinedstorage.network.MessageProcessingPatternEncoderTransfer; import mezz.jei.api.gui.IGuiIngredient; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.transfer.IRecipeTransferError; import mezz.jei.api.recipe.transfer.IRecipeTransferHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import refinedstorage.RS; -import refinedstorage.apiimpl.API; -import refinedstorage.container.ContainerProcessingPatternEncoder; -import refinedstorage.network.MessageProcessingPatternEncoderTransfer; import javax.annotation.Nullable; import java.util.HashMap; diff --git a/src/main/java/refinedstorage/integration/jei/RecipeWrapperSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeWrapperSolderer.java similarity index 96% rename from src/main/java/refinedstorage/integration/jei/RecipeWrapperSolderer.java rename to src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeWrapperSolderer.java index bf10c8c00..ad2b0a494 100755 --- a/src/main/java/refinedstorage/integration/jei/RecipeWrapperSolderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeWrapperSolderer.java @@ -1,4 +1,4 @@ -package refinedstorage.integration.jei; +package com.raoulvdberge.refinedstorage.integration.jei; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; diff --git a/src/main/java/refinedstorage/integration/tesla/ControllerEnergyTesla.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/ControllerEnergyTesla.java similarity index 91% rename from src/main/java/refinedstorage/integration/tesla/ControllerEnergyTesla.java rename to src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/ControllerEnergyTesla.java index 578d96548..271b19243 100755 --- a/src/main/java/refinedstorage/integration/tesla/ControllerEnergyTesla.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/ControllerEnergyTesla.java @@ -1,4 +1,4 @@ -package refinedstorage.integration.tesla; +package com.raoulvdberge.refinedstorage.integration.tesla; import cofh.api.energy.EnergyStorage; import net.darkhax.tesla.api.ITeslaConsumer; diff --git a/src/main/java/refinedstorage/integration/tesla/IntegrationTesla.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/IntegrationTesla.java similarity index 74% rename from src/main/java/refinedstorage/integration/tesla/IntegrationTesla.java rename to src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/IntegrationTesla.java index 5cee05796..84f0c54ed 100755 --- a/src/main/java/refinedstorage/integration/tesla/IntegrationTesla.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/IntegrationTesla.java @@ -1,4 +1,4 @@ -package refinedstorage.integration.tesla; +package com.raoulvdberge.refinedstorage.integration.tesla; import net.minecraftforge.fml.common.Loader; diff --git a/src/main/java/refinedstorage/integration/tesla/WirelessGridEnergyTesla.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/WirelessGridEnergyTesla.java similarity index 87% rename from src/main/java/refinedstorage/integration/tesla/WirelessGridEnergyTesla.java rename to src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/WirelessGridEnergyTesla.java index d0af7e4d9..2bd7656d6 100755 --- a/src/main/java/refinedstorage/integration/tesla/WirelessGridEnergyTesla.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/WirelessGridEnergyTesla.java @@ -1,9 +1,9 @@ -package refinedstorage.integration.tesla; +package com.raoulvdberge.refinedstorage.integration.tesla; +import com.raoulvdberge.refinedstorage.RSItems; import net.darkhax.tesla.api.ITeslaConsumer; import net.darkhax.tesla.api.ITeslaHolder; import net.minecraft.item.ItemStack; -import refinedstorage.RSItems; public class WirelessGridEnergyTesla implements ITeslaHolder, ITeslaConsumer { private ItemStack stack; diff --git a/src/main/java/refinedstorage/inventory/IItemValidator.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/IItemValidator.java similarity index 76% rename from src/main/java/refinedstorage/inventory/IItemValidator.java rename to src/main/java/com/raoulvdberge/refinedstorage/inventory/IItemValidator.java index ec47640c1..208fa9a67 100755 --- a/src/main/java/refinedstorage/inventory/IItemValidator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/IItemValidator.java @@ -1,9 +1,9 @@ -package refinedstorage.inventory; +package com.raoulvdberge.refinedstorage.inventory; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.apiimpl.storage.fluid.FluidStorageNBT; +import com.raoulvdberge.refinedstorage.apiimpl.storage.item.ItemStorageNBT; import net.minecraft.item.ItemStack; -import refinedstorage.RSItems; -import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT; -import refinedstorage.apiimpl.storage.item.ItemStorageNBT; public interface IItemValidator { IItemValidator ITEM_STORAGE_DISK = new ItemValidatorBasic(RSItems.STORAGE_DISK) { diff --git a/src/main/java/refinedstorage/inventory/ItemHandlerBasic.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemHandlerBasic.java similarity index 96% rename from src/main/java/refinedstorage/inventory/ItemHandlerBasic.java rename to src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemHandlerBasic.java index 641beaec1..44a223025 100755 --- a/src/main/java/refinedstorage/inventory/ItemHandlerBasic.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemHandlerBasic.java @@ -1,4 +1,4 @@ -package refinedstorage.inventory; +package com.raoulvdberge.refinedstorage.inventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/refinedstorage/inventory/ItemHandlerFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemHandlerFluid.java similarity index 91% rename from src/main/java/refinedstorage/inventory/ItemHandlerFluid.java rename to src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemHandlerFluid.java index c419fc6c7..de9522ee8 100755 --- a/src/main/java/refinedstorage/inventory/ItemHandlerFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemHandlerFluid.java @@ -1,10 +1,10 @@ -package refinedstorage.inventory; +package com.raoulvdberge.refinedstorage.inventory; +import com.raoulvdberge.refinedstorage.RSUtils; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.items.ItemHandlerHelper; -import refinedstorage.RSUtils; public class ItemHandlerFluid extends ItemHandlerBasic { private FluidStack[] fluids; diff --git a/src/main/java/refinedstorage/inventory/ItemHandlerGridFilter.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemHandlerGridFilter.java similarity index 88% rename from src/main/java/refinedstorage/inventory/ItemHandlerGridFilter.java rename to src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemHandlerGridFilter.java index a11842c16..502fd946e 100755 --- a/src/main/java/refinedstorage/inventory/ItemHandlerGridFilter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemHandlerGridFilter.java @@ -1,9 +1,9 @@ -package refinedstorage.inventory; +package com.raoulvdberge.refinedstorage.inventory; +import com.raoulvdberge.refinedstorage.RSUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.items.ItemStackHandler; -import refinedstorage.RSUtils; public class ItemHandlerGridFilter extends ItemStackHandler { private ItemStack stack; diff --git a/src/main/java/refinedstorage/inventory/ItemHandlerGridFilterInGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemHandlerGridFilterInGrid.java similarity index 81% rename from src/main/java/refinedstorage/inventory/ItemHandlerGridFilterInGrid.java rename to src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemHandlerGridFilterInGrid.java index 79f52ae4a..d307ee7e8 100755 --- a/src/main/java/refinedstorage/inventory/ItemHandlerGridFilterInGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemHandlerGridFilterInGrid.java @@ -1,12 +1,12 @@ -package refinedstorage.inventory; +package com.raoulvdberge.refinedstorage.inventory; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.gui.grid.GridFilteredItem; +import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid; +import com.raoulvdberge.refinedstorage.item.ItemGridFilter; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; -import refinedstorage.RSItems; -import refinedstorage.gui.grid.GridFilteredItem; -import refinedstorage.gui.grid.GuiGrid; -import refinedstorage.item.ItemGridFilter; import java.util.List; diff --git a/src/main/java/refinedstorage/inventory/ItemHandlerUpgrade.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemHandlerUpgrade.java similarity index 92% rename from src/main/java/refinedstorage/inventory/ItemHandlerUpgrade.java rename to src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemHandlerUpgrade.java index ee82a3f5f..8daad1ade 100755 --- a/src/main/java/refinedstorage/inventory/ItemHandlerUpgrade.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemHandlerUpgrade.java @@ -1,8 +1,8 @@ -package refinedstorage.inventory; +package com.raoulvdberge.refinedstorage.inventory; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.item.ItemUpgrade; import net.minecraft.tileentity.TileEntity; -import refinedstorage.RSItems; -import refinedstorage.item.ItemUpgrade; public class ItemHandlerUpgrade extends ItemHandlerBasic { public ItemHandlerUpgrade(int size, TileEntity tile, int... supportedUpgrades) { diff --git a/src/main/java/refinedstorage/inventory/ItemValidatorBasic.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemValidatorBasic.java similarity index 92% rename from src/main/java/refinedstorage/inventory/ItemValidatorBasic.java rename to src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemValidatorBasic.java index cfae89161..6266f17fb 100755 --- a/src/main/java/refinedstorage/inventory/ItemValidatorBasic.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemValidatorBasic.java @@ -1,4 +1,4 @@ -package refinedstorage.inventory; +package com.raoulvdberge.refinedstorage.inventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/refinedstorage/item/ItemBase.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBase.java similarity index 87% rename from src/main/java/refinedstorage/item/ItemBase.java rename to src/main/java/com/raoulvdberge/refinedstorage/item/ItemBase.java index 9920055ef..39cf9c466 100755 --- a/src/main/java/refinedstorage/item/ItemBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBase.java @@ -1,8 +1,8 @@ -package refinedstorage.item; +package com.raoulvdberge.refinedstorage.item; +import com.raoulvdberge.refinedstorage.RS; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import refinedstorage.RS; public abstract class ItemBase extends Item { private String name; diff --git a/src/main/java/refinedstorage/item/ItemBlockBase.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockBase.java similarity index 90% rename from src/main/java/refinedstorage/item/ItemBlockBase.java rename to src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockBase.java index 9c5d948da..665e74444 100755 --- a/src/main/java/refinedstorage/item/ItemBlockBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockBase.java @@ -1,5 +1,7 @@ -package refinedstorage.item; +package com.raoulvdberge.refinedstorage.item; +import com.raoulvdberge.refinedstorage.block.EnumPlacementType; +import com.raoulvdberge.refinedstorage.tile.TileBase; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -9,8 +11,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import refinedstorage.block.EnumPlacementType; -import refinedstorage.tile.TileBase; public class ItemBlockBase extends ItemBlock { private EnumPlacementType placementType; diff --git a/src/main/java/refinedstorage/item/ItemBlockController.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockController.java similarity index 87% rename from src/main/java/refinedstorage/item/ItemBlockController.java rename to src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockController.java index ed7f78dd6..7a0450b16 100755 --- a/src/main/java/refinedstorage/item/ItemBlockController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockController.java @@ -1,14 +1,14 @@ -package refinedstorage.item; +package com.raoulvdberge.refinedstorage.item; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.block.EnumControllerType; +import com.raoulvdberge.refinedstorage.tile.TileController; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSBlocks; -import refinedstorage.block.EnumControllerType; -import refinedstorage.tile.TileController; import java.util.List; diff --git a/src/main/java/refinedstorage/item/ItemBlockFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockFluidStorage.java similarity index 91% rename from src/main/java/refinedstorage/item/ItemBlockFluidStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockFluidStorage.java index bc88e67b0..447cec7ec 100755 --- a/src/main/java/refinedstorage/item/ItemBlockFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockFluidStorage.java @@ -1,5 +1,10 @@ -package refinedstorage.item; +package com.raoulvdberge.refinedstorage.item; +import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.apiimpl.storage.fluid.FluidStorageNBT; +import com.raoulvdberge.refinedstorage.block.EnumFluidStorageType; +import com.raoulvdberge.refinedstorage.tile.TileFluidStorage; import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -10,11 +15,6 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; -import refinedstorage.RSBlocks; -import refinedstorage.RSItems; -import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT; -import refinedstorage.block.EnumFluidStorageType; -import refinedstorage.tile.TileFluidStorage; import java.util.List; diff --git a/src/main/java/refinedstorage/item/ItemBlockStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockStorage.java similarity index 91% rename from src/main/java/refinedstorage/item/ItemBlockStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockStorage.java index 87052c98c..fd6761f53 100755 --- a/src/main/java/refinedstorage/item/ItemBlockStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockStorage.java @@ -1,95 +1,95 @@ -package refinedstorage.item; - -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.InventoryHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; -import net.minecraft.world.World; -import refinedstorage.RSBlocks; -import refinedstorage.RSItems; -import refinedstorage.apiimpl.storage.item.ItemStorageNBT; -import refinedstorage.block.EnumItemStorageType; -import refinedstorage.tile.TileStorage; - -import java.util.List; - -public class ItemBlockStorage extends ItemBlockBase { - public ItemBlockStorage() { - super(RSBlocks.STORAGE, RSBlocks.STORAGE.getPlacementType(), true); - } - - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - EnumItemStorageType type = EnumItemStorageType.getById(stack.getMetadata()); - - if (type != null && isValid(stack)) { - NBTTagCompound tag = stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE); - - if (type == EnumItemStorageType.TYPE_CREATIVE) { - tooltip.add(I18n.format("misc.refinedstorage:storage.stored", ItemStorageNBT.getStoredFromNBT(tag))); - } else { - tooltip.add(I18n.format("misc.refinedstorage:storage.stored_capacity", ItemStorageNBT.getStoredFromNBT(tag), type.getCapacity())); - } - } - } - - @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { - EnumItemStorageType type = EnumItemStorageType.getById(stack.getMetadata()); - - if (type != null && stack.stackSize == 1 && isValid(stack) && ItemStorageNBT.getStoredFromNBT(stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE)) == 0 && stack.getMetadata() != ItemStorageDisk.TYPE_CREATIVE && !world.isRemote && player.isSneaking()) { - ItemStack storagePart = new ItemStack(RSItems.STORAGE_PART, 1, stack.getMetadata()); - - if (!player.inventory.addItemStackToInventory(storagePart.copy())) { - InventoryHelper.spawnItemStack(world, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), storagePart); - } - - ItemStack processor = new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC); - - if (!player.inventory.addItemStackToInventory(processor.copy())) { - InventoryHelper.spawnItemStack(world, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), processor); - } - - return new ActionResult<>(EnumActionResult.SUCCESS, new ItemStack(RSBlocks.MACHINE_CASING)); - } - - return new ActionResult<>(EnumActionResult.PASS, stack); - } - - private static boolean isValid(ItemStack stack) { - return stack.getTagCompound() != null && stack.getTagCompound().hasKey(TileStorage.NBT_STORAGE); - } - - @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean selected) { - super.onUpdate(stack, world, entity, slot, selected); - - if (!stack.hasTagCompound()) { - initNBT(stack); - } - } - - @Override - public void onCreated(ItemStack stack, World world, EntityPlayer player) { - super.onCreated(stack, world, player); - - initNBT(stack); - } - - @Override - public int getEntityLifespan(ItemStack stack, World world) { - return Integer.MAX_VALUE; - } - - public static ItemStack initNBT(ItemStack stack) { - NBTTagCompound tag = new NBTTagCompound(); - tag.setTag(TileStorage.NBT_STORAGE, ItemStorageNBT.createNBT()); - stack.setTagCompound(tag); - return stack; - } -} +package com.raoulvdberge.refinedstorage.item; + +import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.apiimpl.storage.item.ItemStorageNBT; +import com.raoulvdberge.refinedstorage.block.EnumItemStorageType; +import com.raoulvdberge.refinedstorage.tile.TileStorage; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.InventoryHelper; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.world.World; + +import java.util.List; + +public class ItemBlockStorage extends ItemBlockBase { + public ItemBlockStorage() { + super(RSBlocks.STORAGE, RSBlocks.STORAGE.getPlacementType(), true); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + EnumItemStorageType type = EnumItemStorageType.getById(stack.getMetadata()); + + if (type != null && isValid(stack)) { + NBTTagCompound tag = stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE); + + if (type == EnumItemStorageType.TYPE_CREATIVE) { + tooltip.add(I18n.format("misc.refinedstorage:storage.stored", ItemStorageNBT.getStoredFromNBT(tag))); + } else { + tooltip.add(I18n.format("misc.refinedstorage:storage.stored_capacity", ItemStorageNBT.getStoredFromNBT(tag), type.getCapacity())); + } + } + } + + @Override + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + EnumItemStorageType type = EnumItemStorageType.getById(stack.getMetadata()); + + if (type != null && stack.stackSize == 1 && isValid(stack) && ItemStorageNBT.getStoredFromNBT(stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE)) == 0 && stack.getMetadata() != ItemStorageDisk.TYPE_CREATIVE && !world.isRemote && player.isSneaking()) { + ItemStack storagePart = new ItemStack(RSItems.STORAGE_PART, 1, stack.getMetadata()); + + if (!player.inventory.addItemStackToInventory(storagePart.copy())) { + InventoryHelper.spawnItemStack(world, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), storagePart); + } + + ItemStack processor = new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC); + + if (!player.inventory.addItemStackToInventory(processor.copy())) { + InventoryHelper.spawnItemStack(world, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), processor); + } + + return new ActionResult<>(EnumActionResult.SUCCESS, new ItemStack(RSBlocks.MACHINE_CASING)); + } + + return new ActionResult<>(EnumActionResult.PASS, stack); + } + + private static boolean isValid(ItemStack stack) { + return stack.getTagCompound() != null && stack.getTagCompound().hasKey(TileStorage.NBT_STORAGE); + } + + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean selected) { + super.onUpdate(stack, world, entity, slot, selected); + + if (!stack.hasTagCompound()) { + initNBT(stack); + } + } + + @Override + public void onCreated(ItemStack stack, World world, EntityPlayer player) { + super.onCreated(stack, world, player); + + initNBT(stack); + } + + @Override + public int getEntityLifespan(ItemStack stack, World world) { + return Integer.MAX_VALUE; + } + + public static ItemStack initNBT(ItemStack stack) { + NBTTagCompound tag = new NBTTagCompound(); + tag.setTag(TileStorage.NBT_STORAGE, ItemStorageNBT.createNBT()); + stack.setTagCompound(tag); + return stack; + } +} diff --git a/src/main/java/refinedstorage/item/ItemCore.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCore.java similarity index 92% rename from src/main/java/refinedstorage/item/ItemCore.java rename to src/main/java/com/raoulvdberge/refinedstorage/item/ItemCore.java index 26515b552..47fc1a380 100755 --- a/src/main/java/refinedstorage/item/ItemCore.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCore.java @@ -1,4 +1,4 @@ -package refinedstorage.item; +package com.raoulvdberge.refinedstorage.item; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/refinedstorage/item/ItemFluidStorageDisk.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java similarity index 94% rename from src/main/java/refinedstorage/item/ItemFluidStorageDisk.java rename to src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java index 8ecc8af42..8ce9cd0bc 100755 --- a/src/main/java/refinedstorage/item/ItemFluidStorageDisk.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java @@ -1,5 +1,8 @@ -package refinedstorage.item; +package com.raoulvdberge.refinedstorage.item; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.apiimpl.storage.fluid.FluidStorageNBT; +import com.raoulvdberge.refinedstorage.block.EnumFluidStorageType; import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -15,9 +18,6 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import refinedstorage.RSItems; -import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT; -import refinedstorage.block.EnumFluidStorageType; import java.util.List; diff --git a/src/main/java/refinedstorage/item/ItemFluidStoragePart.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStoragePart.java similarity index 93% rename from src/main/java/refinedstorage/item/ItemFluidStoragePart.java rename to src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStoragePart.java index bbf502d80..0bd2e7682 100755 --- a/src/main/java/refinedstorage/item/ItemFluidStoragePart.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStoragePart.java @@ -1,4 +1,4 @@ -package refinedstorage.item; +package com.raoulvdberge.refinedstorage.item; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/refinedstorage/item/ItemGridFilter.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemGridFilter.java similarity index 85% rename from src/main/java/refinedstorage/item/ItemGridFilter.java rename to src/main/java/com/raoulvdberge/refinedstorage/item/ItemGridFilter.java index 3683fc987..d274ff094 100755 --- a/src/main/java/refinedstorage/item/ItemGridFilter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemGridFilter.java @@ -1,5 +1,10 @@ -package refinedstorage.item; +package com.raoulvdberge.refinedstorage.item; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSGui; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerGridFilter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -7,11 +12,6 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; -import refinedstorage.RS; -import refinedstorage.RSGui; -import refinedstorage.RSItems; -import refinedstorage.api.util.IComparer; -import refinedstorage.inventory.ItemHandlerGridFilter; import java.util.List; diff --git a/src/main/java/refinedstorage/item/ItemNetworkCard.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkCard.java similarity index 96% rename from src/main/java/refinedstorage/item/ItemNetworkCard.java rename to src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkCard.java index 0d6b61521..692675ca5 100755 --- a/src/main/java/refinedstorage/item/ItemNetworkCard.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkCard.java @@ -1,5 +1,6 @@ -package refinedstorage.item; +package com.raoulvdberge.refinedstorage.item; +import com.raoulvdberge.refinedstorage.RSBlocks; import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; @@ -10,7 +11,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import refinedstorage.RSBlocks; import java.util.List; diff --git a/src/main/java/refinedstorage/item/ItemPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemPattern.java similarity index 93% rename from src/main/java/refinedstorage/item/ItemPattern.java rename to src/main/java/com/raoulvdberge/refinedstorage/item/ItemPattern.java index b150bde23..99fc3d0ca 100755 --- a/src/main/java/refinedstorage/item/ItemPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemPattern.java @@ -1,6 +1,12 @@ -package refinedstorage.item; +package com.raoulvdberge.refinedstorage.item; import com.google.common.collect.Iterables; +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.API; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPattern; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; @@ -13,12 +19,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; -import refinedstorage.RSItems; -import refinedstorage.api.autocrafting.ICraftingPattern; -import refinedstorage.api.autocrafting.ICraftingPatternContainer; -import refinedstorage.api.autocrafting.ICraftingPatternProvider; -import refinedstorage.apiimpl.API; -import refinedstorage.apiimpl.autocrafting.CraftingPattern; import javax.annotation.Nonnull; import java.util.*; diff --git a/src/main/java/refinedstorage/item/ItemProcessor.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessor.java similarity index 94% rename from src/main/java/refinedstorage/item/ItemProcessor.java rename to src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessor.java index 3e4d807e4..6e157f46a 100755 --- a/src/main/java/refinedstorage/item/ItemProcessor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessor.java @@ -1,4 +1,4 @@ -package refinedstorage.item; +package com.raoulvdberge.refinedstorage.item; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/refinedstorage/item/ItemQuartzEnrichedIron.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemQuartzEnrichedIron.java similarity index 75% rename from src/main/java/refinedstorage/item/ItemQuartzEnrichedIron.java rename to src/main/java/com/raoulvdberge/refinedstorage/item/ItemQuartzEnrichedIron.java index c943fb950..3f2bd0652 100755 --- a/src/main/java/refinedstorage/item/ItemQuartzEnrichedIron.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemQuartzEnrichedIron.java @@ -1,7 +1,7 @@ -package refinedstorage.item; - -public class ItemQuartzEnrichedIron extends ItemBase { - public ItemQuartzEnrichedIron() { - super("quartz_enriched_iron"); - } -} +package com.raoulvdberge.refinedstorage.item; + +public class ItemQuartzEnrichedIron extends ItemBase { + public ItemQuartzEnrichedIron() { + super("quartz_enriched_iron"); + } +} diff --git a/src/main/java/refinedstorage/item/ItemSilicon.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemSilicon.java similarity index 69% rename from src/main/java/refinedstorage/item/ItemSilicon.java rename to src/main/java/com/raoulvdberge/refinedstorage/item/ItemSilicon.java index 8217d0b25..9c64f9bb7 100755 --- a/src/main/java/refinedstorage/item/ItemSilicon.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemSilicon.java @@ -1,7 +1,7 @@ -package refinedstorage.item; - -public class ItemSilicon extends ItemBase { - public ItemSilicon() { - super("silicon"); - } -} +package com.raoulvdberge.refinedstorage.item; + +public class ItemSilicon extends ItemBase { + public ItemSilicon() { + super("silicon"); + } +} diff --git a/src/main/java/refinedstorage/item/ItemStorageDisk.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java similarity index 93% rename from src/main/java/refinedstorage/item/ItemStorageDisk.java rename to src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java index 0457cc721..cd2b0a81e 100755 --- a/src/main/java/refinedstorage/item/ItemStorageDisk.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java @@ -1,5 +1,8 @@ -package refinedstorage.item; +package com.raoulvdberge.refinedstorage.item; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.apiimpl.storage.item.ItemStorageNBT; +import com.raoulvdberge.refinedstorage.block.EnumItemStorageType; import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -12,9 +15,6 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; -import refinedstorage.RSItems; -import refinedstorage.apiimpl.storage.item.ItemStorageNBT; -import refinedstorage.block.EnumItemStorageType; import java.util.ArrayList; import java.util.Iterator; @@ -69,7 +69,7 @@ public class ItemStorageDisk extends ItemBase { } }; - Iterator it = Item.REGISTRY.iterator(); + Iterator it = REGISTRY.iterator(); while (it.hasNext()) { Item item = it.next(); diff --git a/src/main/java/refinedstorage/item/ItemStorageHousing.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageHousing.java similarity index 73% rename from src/main/java/refinedstorage/item/ItemStorageHousing.java rename to src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageHousing.java index 64e5ccafd..da4bbb8f4 100755 --- a/src/main/java/refinedstorage/item/ItemStorageHousing.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageHousing.java @@ -1,4 +1,4 @@ -package refinedstorage.item; +package com.raoulvdberge.refinedstorage.item; public class ItemStorageHousing extends ItemBase { public ItemStorageHousing() { diff --git a/src/main/java/refinedstorage/item/ItemStoragePart.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStoragePart.java similarity index 93% rename from src/main/java/refinedstorage/item/ItemStoragePart.java rename to src/main/java/com/raoulvdberge/refinedstorage/item/ItemStoragePart.java index b643e9780..5b9b1ee03 100755 --- a/src/main/java/refinedstorage/item/ItemStoragePart.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStoragePart.java @@ -1,4 +1,4 @@ -package refinedstorage.item; +package com.raoulvdberge.refinedstorage.item; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/refinedstorage/item/ItemUpgrade.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemUpgrade.java similarity index 96% rename from src/main/java/refinedstorage/item/ItemUpgrade.java rename to src/main/java/com/raoulvdberge/refinedstorage/item/ItemUpgrade.java index 3c2d88491..03c1dc49c 100755 --- a/src/main/java/refinedstorage/item/ItemUpgrade.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemUpgrade.java @@ -1,5 +1,7 @@ -package refinedstorage.item; +package com.raoulvdberge.refinedstorage.item; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSItems; import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.Enchantment; @@ -12,8 +14,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import refinedstorage.RS; -import refinedstorage.RSItems; import java.util.List; diff --git a/src/main/java/refinedstorage/item/ItemWirelessGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java similarity index 95% rename from src/main/java/refinedstorage/item/ItemWirelessGrid.java rename to src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java index 2075dedc1..03439a04c 100755 --- a/src/main/java/refinedstorage/item/ItemWirelessGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java @@ -1,6 +1,14 @@ -package refinedstorage.item; +package com.raoulvdberge.refinedstorage.item; import cofh.api.energy.ItemEnergyContainer; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.integration.forgeenergy.WirelessGridEnergyForge; +import com.raoulvdberge.refinedstorage.integration.ic2.IntegrationIC2; +import com.raoulvdberge.refinedstorage.integration.tesla.IntegrationTesla; +import com.raoulvdberge.refinedstorage.integration.tesla.WirelessGridEnergyTesla; +import com.raoulvdberge.refinedstorage.tile.TileController; +import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; import net.darkhax.tesla.capability.TeslaCapabilities; @@ -22,14 +30,6 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.fml.common.Optional; -import refinedstorage.RS; -import refinedstorage.RSBlocks; -import refinedstorage.integration.forgeenergy.WirelessGridEnergyForge; -import refinedstorage.integration.ic2.IntegrationIC2; -import refinedstorage.integration.tesla.IntegrationTesla; -import refinedstorage.integration.tesla.WirelessGridEnergyTesla; -import refinedstorage.tile.TileController; -import refinedstorage.tile.grid.TileGrid; import javax.annotation.Nullable; import java.util.List; diff --git a/src/main/java/refinedstorage/item/PatternBakedModel.java b/src/main/java/com/raoulvdberge/refinedstorage/item/PatternBakedModel.java similarity index 93% rename from src/main/java/refinedstorage/item/PatternBakedModel.java rename to src/main/java/com/raoulvdberge/refinedstorage/item/PatternBakedModel.java index 0bcb9e551..709b2b9df 100755 --- a/src/main/java/refinedstorage/item/PatternBakedModel.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/PatternBakedModel.java @@ -1,5 +1,7 @@ -package refinedstorage.item; +package com.raoulvdberge.refinedstorage.item; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPattern; +import com.raoulvdberge.refinedstorage.gui.GuiBase; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -11,8 +13,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import refinedstorage.apiimpl.autocrafting.CraftingPattern; -import refinedstorage.gui.GuiBase; import javax.annotation.Nullable; import java.util.List; diff --git a/src/main/java/refinedstorage/network/MessageCraftingMonitorCancel.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCraftingMonitorCancel.java similarity index 93% rename from src/main/java/refinedstorage/network/MessageCraftingMonitorCancel.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageCraftingMonitorCancel.java index 0812ecd46..350bd5ae2 100755 --- a/src/main/java/refinedstorage/network/MessageCraftingMonitorCancel.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCraftingMonitorCancel.java @@ -1,11 +1,11 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.tile.TileCraftingMonitor; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.tile.TileCraftingMonitor; public class MessageCraftingMonitorCancel extends MessageHandlerPlayerToServer implements IMessage { private int x; diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingClear.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingClear.java similarity index 92% rename from src/main/java/refinedstorage/network/MessageGridCraftingClear.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingClear.java index c9df6fde8..0375b5389 100755 --- a/src/main/java/refinedstorage/network/MessageGridCraftingClear.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingClear.java @@ -1,13 +1,13 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.block.EnumGridType; +import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.block.EnumGridType; -import refinedstorage.tile.grid.TileGrid; public class MessageGridCraftingClear extends MessageHandlerPlayerToServer implements IMessage { private int x; diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingPreview.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingPreview.java similarity index 91% rename from src/main/java/refinedstorage/network/MessageGridCraftingPreview.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingPreview.java index 194972a9c..f98bb3f34 100755 --- a/src/main/java/refinedstorage/network/MessageGridCraftingPreview.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingPreview.java @@ -1,10 +1,10 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.container.ContainerGrid; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.container.ContainerGrid; public class MessageGridCraftingPreview extends MessageHandlerPlayerToServer implements IMessage { private int hash; diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingPreviewResponse.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingPreviewResponse.java similarity index 87% rename from src/main/java/refinedstorage/network/MessageGridCraftingPreviewResponse.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingPreviewResponse.java index 5275662ef..3d4a206cc 100755 --- a/src/main/java/refinedstorage/network/MessageGridCraftingPreviewResponse.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingPreviewResponse.java @@ -1,13 +1,13 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; +import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.proxy.ProxyClient; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; -import refinedstorage.apiimpl.API; -import refinedstorage.proxy.ProxyClient; import java.util.LinkedList; import java.util.List; @@ -56,7 +56,7 @@ public class MessageGridCraftingPreviewResponse implements IMessage, IMessageHan @Override public IMessage onMessage(MessageGridCraftingPreviewResponse message, MessageContext ctx) { ProxyClient.onReceiveCraftingPreviewResponse(message); - + return null; } } \ No newline at end of file diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingStart.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingStart.java similarity index 86% rename from src/main/java/refinedstorage/network/MessageGridCraftingStart.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingStart.java index e13ad0159..5da089eaa 100755 --- a/src/main/java/refinedstorage/network/MessageGridCraftingStart.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingStart.java @@ -1,11 +1,11 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler; +import com.raoulvdberge.refinedstorage.container.ContainerGrid; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.api.network.grid.IItemGridHandler; -import refinedstorage.container.ContainerGrid; public class MessageGridCraftingStart extends MessageHandlerPlayerToServer implements IMessage { private int hash; diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingTransfer.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingTransfer.java similarity index 87% rename from src/main/java/refinedstorage/network/MessageGridCraftingTransfer.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingTransfer.java index 641596d8c..0eaace24f 100755 --- a/src/main/java/refinedstorage/network/MessageGridCraftingTransfer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingTransfer.java @@ -1,5 +1,9 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.block.EnumGridType; +import com.raoulvdberge.refinedstorage.container.ContainerGrid; +import com.raoulvdberge.refinedstorage.tile.grid.IGrid; +import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -8,10 +12,6 @@ import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.Constants; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.block.EnumGridType; -import refinedstorage.container.ContainerGrid; -import refinedstorage.tile.grid.IGrid; -import refinedstorage.tile.grid.TileGrid; public class MessageGridCraftingTransfer extends MessageHandlerPlayerToServer implements IMessage { private NBTTagCompound recipe; diff --git a/src/main/java/refinedstorage/network/MessageGridFilterUpdate.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFilterUpdate.java similarity index 83% rename from src/main/java/refinedstorage/network/MessageGridFilterUpdate.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFilterUpdate.java index 2fd123dd6..5cede767c 100755 --- a/src/main/java/refinedstorage/network/MessageGridFilterUpdate.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFilterUpdate.java @@ -1,10 +1,10 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.container.ContainerGridFilter; +import com.raoulvdberge.refinedstorage.item.ItemGridFilter; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.container.ContainerGridFilter; -import refinedstorage.item.ItemGridFilter; public class MessageGridFilterUpdate extends MessageHandlerPlayerToServer implements IMessage { private int compare; diff --git a/src/main/java/refinedstorage/network/MessageGridFluidDelta.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidDelta.java similarity index 88% rename from src/main/java/refinedstorage/network/MessageGridFluidDelta.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidDelta.java index 78ff9fb2b..a34879c9a 100755 --- a/src/main/java/refinedstorage/network/MessageGridFluidDelta.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidDelta.java @@ -1,14 +1,14 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid; +import com.raoulvdberge.refinedstorage.gui.grid.stack.ClientStackFluid; import io.netty.buffer.ByteBuf; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import refinedstorage.RSUtils; -import refinedstorage.gui.grid.GuiGrid; -import refinedstorage.gui.grid.stack.ClientStackFluid; public class MessageGridFluidDelta implements IMessage, IMessageHandler { private FluidStack stack; diff --git a/src/main/java/refinedstorage/network/MessageGridFluidInsertHeld.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidInsertHeld.java similarity index 82% rename from src/main/java/refinedstorage/network/MessageGridFluidInsertHeld.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidInsertHeld.java index f0b47435c..01e3dc4a9 100755 --- a/src/main/java/refinedstorage/network/MessageGridFluidInsertHeld.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidInsertHeld.java @@ -1,11 +1,11 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.api.network.grid.IFluidGridHandler; +import com.raoulvdberge.refinedstorage.container.ContainerGrid; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.api.network.grid.IFluidGridHandler; -import refinedstorage.container.ContainerGrid; public class MessageGridFluidInsertHeld extends MessageHandlerPlayerToServer implements IMessage { public MessageGridFluidInsertHeld() { diff --git a/src/main/java/refinedstorage/network/MessageGridFluidPull.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidPull.java similarity index 86% rename from src/main/java/refinedstorage/network/MessageGridFluidPull.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidPull.java index 0210ef782..837e1ccb4 100755 --- a/src/main/java/refinedstorage/network/MessageGridFluidPull.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidPull.java @@ -1,11 +1,11 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.api.network.grid.IFluidGridHandler; +import com.raoulvdberge.refinedstorage.container.ContainerGrid; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.api.network.grid.IFluidGridHandler; -import refinedstorage.container.ContainerGrid; public class MessageGridFluidPull extends MessageHandlerPlayerToServer implements IMessage { private int hash; diff --git a/src/main/java/refinedstorage/network/MessageGridFluidUpdate.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidUpdate.java similarity index 84% rename from src/main/java/refinedstorage/network/MessageGridFluidUpdate.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidUpdate.java index bf641d1b3..d91efc004 100755 --- a/src/main/java/refinedstorage/network/MessageGridFluidUpdate.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidUpdate.java @@ -1,14 +1,14 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid; +import com.raoulvdberge.refinedstorage.gui.grid.stack.ClientStackFluid; import io.netty.buffer.ByteBuf; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import refinedstorage.RSUtils; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.gui.grid.GuiGrid; -import refinedstorage.gui.grid.stack.ClientStackFluid; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/refinedstorage/network/MessageGridItemDelta.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemDelta.java similarity index 86% rename from src/main/java/refinedstorage/network/MessageGridItemDelta.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemDelta.java index 006761d9c..1a3722f3b 100755 --- a/src/main/java/refinedstorage/network/MessageGridItemDelta.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemDelta.java @@ -1,15 +1,15 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid; +import com.raoulvdberge.refinedstorage.gui.grid.stack.ClientStackItem; import io.netty.buffer.ByteBuf; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import refinedstorage.RSUtils; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.gui.grid.GuiGrid; -import refinedstorage.gui.grid.stack.ClientStackItem; public class MessageGridItemDelta implements IMessage, IMessageHandler { private INetworkMaster network; diff --git a/src/main/java/refinedstorage/network/MessageGridItemInsertHeld.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemInsertHeld.java similarity index 85% rename from src/main/java/refinedstorage/network/MessageGridItemInsertHeld.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemInsertHeld.java index 0e3265ee0..c4d3f21a2 100755 --- a/src/main/java/refinedstorage/network/MessageGridItemInsertHeld.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemInsertHeld.java @@ -1,11 +1,11 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler; +import com.raoulvdberge.refinedstorage.container.ContainerGrid; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.api.network.grid.IItemGridHandler; -import refinedstorage.container.ContainerGrid; public class MessageGridItemInsertHeld extends MessageHandlerPlayerToServer implements IMessage { private boolean single; diff --git a/src/main/java/refinedstorage/network/MessageGridItemPull.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemPull.java similarity index 86% rename from src/main/java/refinedstorage/network/MessageGridItemPull.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemPull.java index c13a01c26..da09cce25 100755 --- a/src/main/java/refinedstorage/network/MessageGridItemPull.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemPull.java @@ -1,11 +1,11 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler; +import com.raoulvdberge.refinedstorage.container.ContainerGrid; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.api.network.grid.IItemGridHandler; -import refinedstorage.container.ContainerGrid; public class MessageGridItemPull extends MessageHandlerPlayerToServer implements IMessage { private int hash; diff --git a/src/main/java/refinedstorage/network/MessageGridItemUpdate.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemUpdate.java similarity index 83% rename from src/main/java/refinedstorage/network/MessageGridItemUpdate.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemUpdate.java index d90b06a37..14c8712c2 100755 --- a/src/main/java/refinedstorage/network/MessageGridItemUpdate.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemUpdate.java @@ -1,14 +1,14 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid; +import com.raoulvdberge.refinedstorage.gui.grid.stack.ClientStackItem; import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import refinedstorage.RSUtils; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.gui.grid.GuiGrid; -import refinedstorage.gui.grid.stack.ClientStackItem; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/refinedstorage/network/MessageGridPatternCreate.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridPatternCreate.java similarity index 85% rename from src/main/java/refinedstorage/network/MessageGridPatternCreate.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridPatternCreate.java index 9c221e2a7..6b29f7dd5 100755 --- a/src/main/java/refinedstorage/network/MessageGridPatternCreate.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridPatternCreate.java @@ -1,13 +1,13 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.block.EnumGridType; +import com.raoulvdberge.refinedstorage.tile.TileProcessingPatternEncoder; +import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.block.EnumGridType; -import refinedstorage.tile.TileProcessingPatternEncoder; -import refinedstorage.tile.grid.TileGrid; public class MessageGridPatternCreate extends MessageHandlerPlayerToServer implements IMessage { private int x; diff --git a/src/main/java/refinedstorage/network/MessageHandlerPlayerToServer.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageHandlerPlayerToServer.java similarity index 93% rename from src/main/java/refinedstorage/network/MessageHandlerPlayerToServer.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageHandlerPlayerToServer.java index de261d388..bd8849ba8 100755 --- a/src/main/java/refinedstorage/network/MessageHandlerPlayerToServer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageHandlerPlayerToServer.java @@ -1,4 +1,4 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; diff --git a/src/main/java/refinedstorage/network/MessageProcessingPatternEncoderClear.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageProcessingPatternEncoderClear.java similarity index 92% rename from src/main/java/refinedstorage/network/MessageProcessingPatternEncoderClear.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageProcessingPatternEncoderClear.java index 2f06f2b8a..fbd0f0680 100755 --- a/src/main/java/refinedstorage/network/MessageProcessingPatternEncoderClear.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageProcessingPatternEncoderClear.java @@ -1,11 +1,11 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.tile.TileProcessingPatternEncoder; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.tile.TileProcessingPatternEncoder; public class MessageProcessingPatternEncoderClear extends MessageHandlerPlayerToServer implements IMessage { private int x; diff --git a/src/main/java/refinedstorage/network/MessageProcessingPatternEncoderTransfer.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageProcessingPatternEncoderTransfer.java similarity index 93% rename from src/main/java/refinedstorage/network/MessageProcessingPatternEncoderTransfer.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageProcessingPatternEncoderTransfer.java index 384691bc3..cef5970f4 100755 --- a/src/main/java/refinedstorage/network/MessageProcessingPatternEncoderTransfer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageProcessingPatternEncoderTransfer.java @@ -1,11 +1,11 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.container.ContainerProcessingPatternEncoder; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.container.ContainerProcessingPatternEncoder; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/refinedstorage/network/MessageTileDataParameter.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageTileDataParameter.java similarity index 88% rename from src/main/java/refinedstorage/network/MessageTileDataParameter.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageTileDataParameter.java index 723f9968d..37a7ef40d 100755 --- a/src/main/java/refinedstorage/network/MessageTileDataParameter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageTileDataParameter.java @@ -1,13 +1,13 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import io.netty.buffer.ByteBuf; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import refinedstorage.tile.data.TileDataManager; -import refinedstorage.tile.data.TileDataParameter; public class MessageTileDataParameter implements IMessage, IMessageHandler { private TileEntity tile; diff --git a/src/main/java/refinedstorage/network/MessageTileDataParameterUpdate.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageTileDataParameterUpdate.java similarity index 83% rename from src/main/java/refinedstorage/network/MessageTileDataParameterUpdate.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageTileDataParameterUpdate.java index c6647bde4..91101e662 100755 --- a/src/main/java/refinedstorage/network/MessageTileDataParameterUpdate.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageTileDataParameterUpdate.java @@ -1,14 +1,14 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.container.ContainerBase; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataConsumer; +import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.container.ContainerBase; -import refinedstorage.tile.data.ITileDataConsumer; -import refinedstorage.tile.data.TileDataManager; -import refinedstorage.tile.data.TileDataParameter; public class MessageTileDataParameterUpdate extends MessageHandlerPlayerToServer implements IMessage { private TileDataParameter parameter; diff --git a/src/main/java/refinedstorage/network/MessageWirelessGridSettingsUpdate.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageWirelessGridSettingsUpdate.java similarity index 89% rename from src/main/java/refinedstorage/network/MessageWirelessGridSettingsUpdate.java rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageWirelessGridSettingsUpdate.java index 2729a1795..877fb1c44 100755 --- a/src/main/java/refinedstorage/network/MessageWirelessGridSettingsUpdate.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageWirelessGridSettingsUpdate.java @@ -1,13 +1,13 @@ -package refinedstorage.network; +package com.raoulvdberge.refinedstorage.network; +import com.raoulvdberge.refinedstorage.container.ContainerGrid; +import com.raoulvdberge.refinedstorage.tile.grid.IGrid; +import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; +import com.raoulvdberge.refinedstorage.tile.grid.WirelessGrid; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.container.ContainerGrid; -import refinedstorage.tile.grid.IGrid; -import refinedstorage.tile.grid.TileGrid; -import refinedstorage.tile.grid.WirelessGrid; public class MessageWirelessGridSettingsUpdate extends MessageHandlerPlayerToServer implements IMessage { private int viewType; diff --git a/src/main/java/refinedstorage/proxy/ProxyClient.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java similarity index 97% rename from src/main/java/refinedstorage/proxy/ProxyClient.java rename to src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java index 85a00bd1a..f52b18ae5 100755 --- a/src/main/java/refinedstorage/proxy/ProxyClient.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java @@ -1,5 +1,14 @@ -package refinedstorage.proxy; +package com.raoulvdberge.refinedstorage.proxy; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.block.*; +import com.raoulvdberge.refinedstorage.gui.GuiCraftingPreview; +import com.raoulvdberge.refinedstorage.gui.grid.GuiCraftingStart; +import com.raoulvdberge.refinedstorage.item.*; +import com.raoulvdberge.refinedstorage.network.MessageGridCraftingPreviewResponse; +import com.raoulvdberge.refinedstorage.tile.TileController; import mcmultipart.client.multipart.ModelMultipartContainer; import mcmultipart.raytrace.PartMOP; import mcmultipart.raytrace.RayTraceUtils; @@ -27,15 +36,6 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.lwjgl.opengl.GL11; -import refinedstorage.RS; -import refinedstorage.RSBlocks; -import refinedstorage.RSItems; -import refinedstorage.block.*; -import refinedstorage.gui.GuiCraftingPreview; -import refinedstorage.gui.grid.GuiCraftingStart; -import refinedstorage.item.*; -import refinedstorage.network.MessageGridCraftingPreviewResponse; -import refinedstorage.tile.TileController; import java.util.List; diff --git a/src/main/java/refinedstorage/proxy/ProxyCommon.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java similarity index 94% rename from src/main/java/refinedstorage/proxy/ProxyCommon.java rename to src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java index 00035b3f3..211a6719a 100755 --- a/src/main/java/refinedstorage/proxy/ProxyCommon.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java @@ -1,5 +1,30 @@ -package refinedstorage.proxy; +package com.raoulvdberge.refinedstorage.proxy; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementError; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementFluidRender; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementItemRender; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementText; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementFluidStack; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementItemStack; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.registry.CraftingTaskFactory; +import com.raoulvdberge.refinedstorage.apiimpl.solderer.*; +import com.raoulvdberge.refinedstorage.apiimpl.storage.fluid.FluidStorageNBT; +import com.raoulvdberge.refinedstorage.apiimpl.storage.item.ItemStorageNBT; +import com.raoulvdberge.refinedstorage.block.*; +import com.raoulvdberge.refinedstorage.gui.GuiHandler; +import com.raoulvdberge.refinedstorage.integration.craftingtweaks.IntegrationCraftingTweaks; +import com.raoulvdberge.refinedstorage.item.*; +import com.raoulvdberge.refinedstorage.network.*; +import com.raoulvdberge.refinedstorage.tile.*; +import com.raoulvdberge.refinedstorage.tile.data.ContainerListener; +import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import com.raoulvdberge.refinedstorage.tile.externalstorage.TileExternalStorage; +import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -15,31 +40,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; -import refinedstorage.RS; -import refinedstorage.RSBlocks; -import refinedstorage.RSItems; -import refinedstorage.RSUtils; -import refinedstorage.apiimpl.API; -import refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementError; -import refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementFluidRender; -import refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementItemRender; -import refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementText; -import refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementFluidStack; -import refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementItemStack; -import refinedstorage.apiimpl.autocrafting.registry.CraftingTaskFactory; -import refinedstorage.apiimpl.solderer.*; -import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT; -import refinedstorage.apiimpl.storage.item.ItemStorageNBT; -import refinedstorage.block.*; -import refinedstorage.gui.GuiHandler; -import refinedstorage.integration.craftingtweaks.IntegrationCraftingTweaks; -import refinedstorage.item.*; -import refinedstorage.network.*; -import refinedstorage.tile.*; -import refinedstorage.tile.data.ContainerListener; -import refinedstorage.tile.data.TileDataManager; -import refinedstorage.tile.externalstorage.TileExternalStorage; -import refinedstorage.tile.grid.TileGrid; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/refinedstorage/tile/ClientNode.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/ClientNode.java similarity index 91% rename from src/main/java/refinedstorage/tile/ClientNode.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/ClientNode.java index 486f0bdc4..c97e27e24 100755 --- a/src/main/java/refinedstorage/tile/ClientNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/ClientNode.java @@ -1,7 +1,7 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; +import com.raoulvdberge.refinedstorage.apiimpl.API; import net.minecraft.item.ItemStack; -import refinedstorage.apiimpl.API; public class ClientNode { private ItemStack stack; diff --git a/src/main/java/refinedstorage/tile/IStorageGui.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/IStorageGui.java similarity index 75% rename from src/main/java/refinedstorage/tile/IStorageGui.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/IStorageGui.java index 420ac2a5e..7479c6082 100755 --- a/src/main/java/refinedstorage/tile/IStorageGui.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/IStorageGui.java @@ -1,7 +1,7 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; -import refinedstorage.api.storage.AccessType; -import refinedstorage.tile.data.TileDataParameter; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; public interface IStorageGui { String getGuiTitle(); diff --git a/src/main/java/refinedstorage/tile/TileBase.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileBase.java similarity index 96% rename from src/main/java/refinedstorage/tile/TileBase.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileBase.java index c784c5875..f57b165e1 100755 --- a/src/main/java/refinedstorage/tile/TileBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileBase.java @@ -1,5 +1,6 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; +import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; @@ -10,7 +11,6 @@ import net.minecraft.util.ITickable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; -import refinedstorage.tile.data.TileDataManager; import javax.annotation.Nullable; diff --git a/src/main/java/refinedstorage/tile/TileCable.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileCable.java similarity index 71% rename from src/main/java/refinedstorage/tile/TileCable.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileCable.java index 7f5959230..843398e8f 100755 --- a/src/main/java/refinedstorage/tile/TileCable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileCable.java @@ -1,6 +1,6 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; -import refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RS; public class TileCable extends TileMultipartNode { @Override diff --git a/src/main/java/refinedstorage/tile/TileConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileConstructor.java similarity index 92% rename from src/main/java/refinedstorage/tile/TileConstructor.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileConstructor.java index e9c924926..56854876d 100755 --- a/src/main/java/refinedstorage/tile/TileConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileConstructor.java @@ -1,6 +1,19 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; import com.mojang.authlib.GameProfile; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.container.slot.SlotSpecimen; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade; +import com.raoulvdberge.refinedstorage.item.ItemUpgrade; +import com.raoulvdberge.refinedstorage.tile.config.IComparable; +import com.raoulvdberge.refinedstorage.tile.config.IType; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataConsumer; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import mcmultipart.microblock.IMicroblock; import net.minecraft.block.Block; import net.minecraft.block.BlockSkull; @@ -23,19 +36,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; -import refinedstorage.RS; -import refinedstorage.RSUtils; -import refinedstorage.api.util.IComparer; -import refinedstorage.container.slot.SlotSpecimen; -import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.inventory.ItemHandlerFluid; -import refinedstorage.inventory.ItemHandlerUpgrade; -import refinedstorage.item.ItemUpgrade; -import refinedstorage.tile.config.IComparable; -import refinedstorage.tile.config.IType; -import refinedstorage.tile.data.ITileDataConsumer; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.TileDataParameter; public class TileConstructor extends TileMultipartNode implements IComparable, IType { public static final TileDataParameter COMPARE = IComparable.createParameter(); diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java similarity index 88% rename from src/main/java/refinedstorage/tile/TileController.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java index 052e85bfd..7bc3084fd 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java @@ -1,7 +1,58 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.RSUtils; +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.registry.ICraftingTaskFactory; +import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; +import com.raoulvdberge.refinedstorage.api.autocrafting.task.IProcessable; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.api.network.INetworkNode; +import com.raoulvdberge.refinedstorage.api.network.INetworkNodeGraph; +import com.raoulvdberge.refinedstorage.api.network.IWirelessGridHandler; +import com.raoulvdberge.refinedstorage.api.network.grid.IFluidGridHandler; +import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorage; +import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorageCache; +import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorage; +import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorageCache; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.apiimpl.network.NetworkNodeGraph; +import com.raoulvdberge.refinedstorage.apiimpl.network.WirelessGridHandler; +import com.raoulvdberge.refinedstorage.apiimpl.network.grid.FluidGridHandler; +import com.raoulvdberge.refinedstorage.apiimpl.network.grid.ItemGridHandler; +import com.raoulvdberge.refinedstorage.apiimpl.storage.fluid.FluidStorageCache; +import com.raoulvdberge.refinedstorage.apiimpl.storage.item.ItemStorageCache; +import com.raoulvdberge.refinedstorage.block.BlockController; +import com.raoulvdberge.refinedstorage.block.EnumControllerType; +import com.raoulvdberge.refinedstorage.block.EnumGridType; +import com.raoulvdberge.refinedstorage.container.ContainerGrid; +import com.raoulvdberge.refinedstorage.integration.forgeenergy.ControllerEnergyForge; +import com.raoulvdberge.refinedstorage.integration.ic2.ControllerEnergyIC2; +import com.raoulvdberge.refinedstorage.integration.ic2.ControllerEnergyIC2None; +import com.raoulvdberge.refinedstorage.integration.ic2.IControllerEnergyIC2; +import com.raoulvdberge.refinedstorage.integration.ic2.IntegrationIC2; +import com.raoulvdberge.refinedstorage.integration.tesla.ControllerEnergyTesla; +import com.raoulvdberge.refinedstorage.integration.tesla.IntegrationTesla; +import com.raoulvdberge.refinedstorage.network.MessageGridFluidDelta; +import com.raoulvdberge.refinedstorage.network.MessageGridFluidUpdate; +import com.raoulvdberge.refinedstorage.network.MessageGridItemDelta; +import com.raoulvdberge.refinedstorage.network.MessageGridItemUpdate; +import com.raoulvdberge.refinedstorage.tile.config.IRedstoneConfigurable; +import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.RSSerializers; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.raoulvdberge.refinedstorage.tile.externalstorage.FluidStorageExternal; +import com.raoulvdberge.refinedstorage.tile.externalstorage.ItemStorageExternal; +import com.raoulvdberge.refinedstorage.tile.grid.IGrid; import net.darkhax.tesla.capability.TeslaCapabilities; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -19,57 +70,6 @@ import net.minecraftforge.common.util.Constants; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.items.ItemHandlerHelper; -import refinedstorage.RS; -import refinedstorage.RSBlocks; -import refinedstorage.RSUtils; -import refinedstorage.api.autocrafting.ICraftingPattern; -import refinedstorage.api.autocrafting.ICraftingPatternContainer; -import refinedstorage.api.autocrafting.ICraftingPatternProvider; -import refinedstorage.api.autocrafting.registry.ICraftingTaskFactory; -import refinedstorage.api.autocrafting.task.ICraftingTask; -import refinedstorage.api.autocrafting.task.IProcessable; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.network.INetworkNode; -import refinedstorage.api.network.INetworkNodeGraph; -import refinedstorage.api.network.IWirelessGridHandler; -import refinedstorage.api.network.grid.IFluidGridHandler; -import refinedstorage.api.network.grid.IItemGridHandler; -import refinedstorage.api.storage.AccessType; -import refinedstorage.api.storage.fluid.IFluidStorage; -import refinedstorage.api.storage.fluid.IFluidStorageCache; -import refinedstorage.api.storage.item.IItemStorage; -import refinedstorage.api.storage.item.IItemStorageCache; -import refinedstorage.api.util.IComparer; -import refinedstorage.apiimpl.API; -import refinedstorage.apiimpl.network.NetworkNodeGraph; -import refinedstorage.apiimpl.network.WirelessGridHandler; -import refinedstorage.apiimpl.network.grid.FluidGridHandler; -import refinedstorage.apiimpl.network.grid.ItemGridHandler; -import refinedstorage.apiimpl.storage.fluid.FluidStorageCache; -import refinedstorage.apiimpl.storage.item.ItemStorageCache; -import refinedstorage.block.BlockController; -import refinedstorage.block.EnumControllerType; -import refinedstorage.block.EnumGridType; -import refinedstorage.container.ContainerGrid; -import refinedstorage.integration.forgeenergy.ControllerEnergyForge; -import refinedstorage.integration.ic2.ControllerEnergyIC2; -import refinedstorage.integration.ic2.ControllerEnergyIC2None; -import refinedstorage.integration.ic2.IControllerEnergyIC2; -import refinedstorage.integration.ic2.IntegrationIC2; -import refinedstorage.integration.tesla.ControllerEnergyTesla; -import refinedstorage.integration.tesla.IntegrationTesla; -import refinedstorage.network.MessageGridFluidDelta; -import refinedstorage.network.MessageGridFluidUpdate; -import refinedstorage.network.MessageGridItemDelta; -import refinedstorage.network.MessageGridItemUpdate; -import refinedstorage.tile.config.IRedstoneConfigurable; -import refinedstorage.tile.config.RedstoneMode; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.RSSerializers; -import refinedstorage.tile.data.TileDataParameter; -import refinedstorage.tile.externalstorage.FluidStorageExternal; -import refinedstorage.tile.externalstorage.ItemStorageExternal; -import refinedstorage.tile.grid.IGrid; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/refinedstorage/tile/TileCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileCrafter.java similarity index 86% rename from src/main/java/refinedstorage/tile/TileCrafter.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileCrafter.java index 869a5286e..cd5a47b6a 100755 --- a/src/main/java/refinedstorage/tile/TileCrafter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileCrafter.java @@ -1,5 +1,18 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSUtils; +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.INetworkMaster; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade; +import com.raoulvdberge.refinedstorage.item.ItemUpgrade; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataConsumer; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataSerializers; @@ -8,19 +21,6 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.CombinedInvWrapper; -import refinedstorage.RS; -import refinedstorage.RSUtils; -import refinedstorage.api.autocrafting.ICraftingPattern; -import refinedstorage.api.autocrafting.ICraftingPatternContainer; -import refinedstorage.api.autocrafting.ICraftingPatternProvider; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.util.IComparer; -import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.inventory.ItemHandlerUpgrade; -import refinedstorage.item.ItemUpgrade; -import refinedstorage.tile.data.ITileDataConsumer; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.TileDataParameter; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/refinedstorage/tile/TileCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileCraftingMonitor.java similarity index 74% rename from src/main/java/refinedstorage/tile/TileCraftingMonitor.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileCraftingMonitor.java index fc7e8043e..0884d308a 100755 --- a/src/main/java/refinedstorage/tile/TileCraftingMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileCraftingMonitor.java @@ -1,10 +1,10 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; -import refinedstorage.RS; -import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.RSSerializers; -import refinedstorage.tile.data.TileDataParameter; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.RSSerializers; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import java.util.Collections; import java.util.List; diff --git a/src/main/java/refinedstorage/tile/TileDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDestructor.java similarity index 92% rename from src/main/java/refinedstorage/tile/TileDestructor.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileDestructor.java index 336646f88..88ff32504 100755 --- a/src/main/java/refinedstorage/tile/TileDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDestructor.java @@ -1,5 +1,18 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade; +import com.raoulvdberge.refinedstorage.item.ItemUpgrade; +import com.raoulvdberge.refinedstorage.tile.config.IComparable; +import com.raoulvdberge.refinedstorage.tile.config.IFilterable; +import com.raoulvdberge.refinedstorage.tile.config.IType; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataConsumer; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import mcmultipart.microblock.IMicroblock; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; @@ -23,19 +36,6 @@ import net.minecraftforge.fluids.capability.wrappers.BlockLiquidWrapper; import net.minecraftforge.fluids.capability.wrappers.FluidBlockWrapper; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; -import refinedstorage.RS; -import refinedstorage.RSUtils; -import refinedstorage.api.util.IComparer; -import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.inventory.ItemHandlerFluid; -import refinedstorage.inventory.ItemHandlerUpgrade; -import refinedstorage.item.ItemUpgrade; -import refinedstorage.tile.config.IComparable; -import refinedstorage.tile.config.IFilterable; -import refinedstorage.tile.config.IType; -import refinedstorage.tile.data.ITileDataConsumer; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.TileDataParameter; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/refinedstorage/tile/TileDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDetector.java similarity index 89% rename from src/main/java/refinedstorage/tile/TileDetector.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileDetector.java index 980a0cde7..a48ec9b48 100755 --- a/src/main/java/refinedstorage/tile/TileDetector.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDetector.java @@ -1,5 +1,21 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.gui.GuiDetector; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid; +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.tile.data.ITileDataConsumer; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.item.ItemStack; @@ -9,22 +25,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.items.IItemHandler; -import refinedstorage.RS; -import refinedstorage.RSBlocks; -import refinedstorage.RSUtils; -import refinedstorage.api.autocrafting.task.ICraftingTask; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.util.IComparer; -import refinedstorage.apiimpl.API; -import refinedstorage.gui.GuiDetector; -import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.inventory.ItemHandlerFluid; -import refinedstorage.tile.config.IComparable; -import refinedstorage.tile.config.IType; -import refinedstorage.tile.config.RedstoneMode; -import refinedstorage.tile.data.ITileDataConsumer; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.TileDataParameter; public class TileDetector extends TileNode implements IComparable, IType { public static final TileDataParameter COMPARE = IComparable.createParameter(); diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java similarity index 90% rename from src/main/java/refinedstorage/tile/TileDiskDrive.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java index 08da1dcfb..9a4f760fa 100755 --- a/src/main/java/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java @@ -1,5 +1,24 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorage; +import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorageProvider; +import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorage; +import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorageProvider; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.apiimpl.storage.fluid.FluidStorageNBT; +import com.raoulvdberge.refinedstorage.apiimpl.storage.item.ItemStorageNBT; +import com.raoulvdberge.refinedstorage.block.EnumFluidStorageType; +import com.raoulvdberge.refinedstorage.block.EnumItemStorageType; +import com.raoulvdberge.refinedstorage.inventory.IItemValidator; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid; +import com.raoulvdberge.refinedstorage.tile.config.*; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; @@ -10,25 +29,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; -import refinedstorage.RS; -import refinedstorage.RSItems; -import refinedstorage.RSUtils; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.storage.AccessType; -import refinedstorage.api.storage.fluid.IFluidStorage; -import refinedstorage.api.storage.fluid.IFluidStorageProvider; -import refinedstorage.api.storage.item.IItemStorage; -import refinedstorage.api.storage.item.IItemStorageProvider; -import refinedstorage.api.util.IComparer; -import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT; -import refinedstorage.apiimpl.storage.item.ItemStorageNBT; -import refinedstorage.block.EnumFluidStorageType; -import refinedstorage.block.EnumItemStorageType; -import refinedstorage.inventory.IItemValidator; -import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.inventory.ItemHandlerFluid; -import refinedstorage.tile.config.*; -import refinedstorage.tile.data.TileDataParameter; import java.util.List; diff --git a/src/main/java/refinedstorage/tile/TileDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java similarity index 92% rename from src/main/java/refinedstorage/tile/TileDiskManipulator.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java index 5a9a0e66d..26083995b 100755 --- a/src/main/java/refinedstorage/tile/TileDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java @@ -1,6 +1,23 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; -import net.minecraft.item.Item; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.apiimpl.storage.fluid.FluidStorageNBT; +import com.raoulvdberge.refinedstorage.apiimpl.storage.item.ItemStorageNBT; +import com.raoulvdberge.refinedstorage.block.EnumFluidStorageType; +import com.raoulvdberge.refinedstorage.block.EnumItemStorageType; +import com.raoulvdberge.refinedstorage.inventory.IItemValidator; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade; +import com.raoulvdberge.refinedstorage.item.ItemUpgrade; +import com.raoulvdberge.refinedstorage.tile.config.IComparable; +import com.raoulvdberge.refinedstorage.tile.config.IFilterable; +import com.raoulvdberge.refinedstorage.tile.config.IType; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataConsumer; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataSerializers; @@ -12,24 +29,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; -import refinedstorage.RS; -import refinedstorage.RSUtils; -import refinedstorage.api.util.IComparer; -import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT; -import refinedstorage.apiimpl.storage.item.ItemStorageNBT; -import refinedstorage.block.EnumFluidStorageType; -import refinedstorage.block.EnumItemStorageType; -import refinedstorage.inventory.IItemValidator; -import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.inventory.ItemHandlerFluid; -import refinedstorage.inventory.ItemHandlerUpgrade; -import refinedstorage.item.ItemUpgrade; -import refinedstorage.tile.config.IComparable; -import refinedstorage.tile.config.IFilterable; -import refinedstorage.tile.config.IType; -import refinedstorage.tile.data.ITileDataConsumer; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.TileDataParameter; import java.util.ArrayList; diff --git a/src/main/java/refinedstorage/tile/TileExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileExporter.java similarity index 90% rename from src/main/java/refinedstorage/tile/TileExporter.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileExporter.java index 2dc6ce6bb..66feedc3d 100755 --- a/src/main/java/refinedstorage/tile/TileExporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileExporter.java @@ -1,5 +1,15 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade; +import com.raoulvdberge.refinedstorage.item.ItemUpgrade; +import com.raoulvdberge.refinedstorage.tile.config.IComparable; +import com.raoulvdberge.refinedstorage.tile.config.IType; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import mcmultipart.microblock.IMicroblock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -11,16 +21,6 @@ import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; -import refinedstorage.RS; -import refinedstorage.RSUtils; -import refinedstorage.api.util.IComparer; -import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.inventory.ItemHandlerFluid; -import refinedstorage.inventory.ItemHandlerUpgrade; -import refinedstorage.item.ItemUpgrade; -import refinedstorage.tile.config.IComparable; -import refinedstorage.tile.config.IType; -import refinedstorage.tile.data.TileDataParameter; public class TileExporter extends TileMultipartNode implements IComparable, IType { public static final TileDataParameter COMPARE = IComparable.createParameter(); diff --git a/src/main/java/refinedstorage/tile/TileFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidInterface.java similarity index 90% rename from src/main/java/refinedstorage/tile/TileFluidInterface.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidInterface.java index 85ffc5fe8..e92c6db51 100755 --- a/src/main/java/refinedstorage/tile/TileFluidInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidInterface.java @@ -1,5 +1,16 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade; +import com.raoulvdberge.refinedstorage.item.ItemUpgrade; +import com.raoulvdberge.refinedstorage.tile.config.IComparable; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.RSSerializers; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; @@ -8,17 +19,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import refinedstorage.RS; -import refinedstorage.RSUtils; -import refinedstorage.api.util.IComparer; -import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.inventory.ItemHandlerFluid; -import refinedstorage.inventory.ItemHandlerUpgrade; -import refinedstorage.item.ItemUpgrade; -import refinedstorage.tile.config.IComparable; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.RSSerializers; -import refinedstorage.tile.data.TileDataParameter; public class TileFluidInterface extends TileNode implements IComparable { public static final int TANK_CAPACITY = 16000; diff --git a/src/main/java/refinedstorage/tile/TileFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidStorage.java similarity index 89% rename from src/main/java/refinedstorage/tile/TileFluidStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidStorage.java index 441ea4d5c..dcd733231 100755 --- a/src/main/java/refinedstorage/tile/TileFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidStorage.java @@ -1,23 +1,23 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorage; +import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorageProvider; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.apiimpl.storage.fluid.FluidStorageNBT; +import com.raoulvdberge.refinedstorage.block.BlockFluidStorage; +import com.raoulvdberge.refinedstorage.block.EnumFluidStorageType; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid; +import com.raoulvdberge.refinedstorage.tile.config.*; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataSerializers; import net.minecraftforge.fluids.FluidStack; -import refinedstorage.RS; -import refinedstorage.RSBlocks; -import refinedstorage.RSUtils; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.storage.AccessType; -import refinedstorage.api.storage.fluid.IFluidStorage; -import refinedstorage.api.storage.fluid.IFluidStorageProvider; -import refinedstorage.api.util.IComparer; -import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT; -import refinedstorage.block.BlockFluidStorage; -import refinedstorage.block.EnumFluidStorageType; -import refinedstorage.inventory.ItemHandlerFluid; -import refinedstorage.tile.config.*; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.TileDataParameter; import java.util.List; diff --git a/src/main/java/refinedstorage/tile/TileImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileImporter.java similarity index 89% rename from src/main/java/refinedstorage/tile/TileImporter.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileImporter.java index 55f48888a..4c5418760 100755 --- a/src/main/java/refinedstorage/tile/TileImporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileImporter.java @@ -1,5 +1,16 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade; +import com.raoulvdberge.refinedstorage.item.ItemUpgrade; +import com.raoulvdberge.refinedstorage.tile.config.IComparable; +import com.raoulvdberge.refinedstorage.tile.config.IFilterable; +import com.raoulvdberge.refinedstorage.tile.config.IType; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import mcmultipart.microblock.IMicroblock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -10,17 +21,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; -import refinedstorage.RS; -import refinedstorage.RSUtils; -import refinedstorage.api.util.IComparer; -import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.inventory.ItemHandlerFluid; -import refinedstorage.inventory.ItemHandlerUpgrade; -import refinedstorage.item.ItemUpgrade; -import refinedstorage.tile.config.IComparable; -import refinedstorage.tile.config.IFilterable; -import refinedstorage.tile.config.IType; -import refinedstorage.tile.data.TileDataParameter; public class TileImporter extends TileMultipartNode implements IComparable, IFilterable, IType { public static final TileDataParameter COMPARE = IComparable.createParameter(); diff --git a/src/main/java/refinedstorage/tile/TileInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileInterface.java similarity index 91% rename from src/main/java/refinedstorage/tile/TileInterface.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileInterface.java index e28b23d53..a15bb38f8 100755 --- a/src/main/java/refinedstorage/tile/TileInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileInterface.java @@ -1,190 +1,190 @@ -package refinedstorage.tile; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.wrapper.CombinedInvWrapper; -import refinedstorage.RS; -import refinedstorage.RSUtils; -import refinedstorage.api.util.IComparer; -import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.inventory.ItemHandlerUpgrade; -import refinedstorage.item.ItemUpgrade; -import refinedstorage.tile.config.IComparable; -import refinedstorage.tile.data.TileDataParameter; - -public class TileInterface extends TileNode implements IComparable { - public static final TileDataParameter COMPARE = IComparable.createParameter(); - - private static final String NBT_COMPARE = "Compare"; - - private ItemHandlerBasic importItems = new ItemHandlerBasic(9, this) { - @Override - public ItemStack extractItem(int slot, int amount, boolean simulate) { - return null; - } - }; - - private ItemHandlerBasic exportSpecimenItems = new ItemHandlerBasic(9, this); - private ItemHandlerBasic exportItems = new ItemHandlerBasic(9, this) { - @Override - public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { - return stack; - } - }; - - private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, this, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK, ItemUpgrade.TYPE_CRAFTING); - - private int compare = IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE; - - private int currentSlot = 0; - - public TileInterface() { - dataManager.addWatchedParameter(COMPARE); - } - - @Override - public int getEnergyUsage() { - return RS.INSTANCE.config.interfaceUsage + upgrades.getEnergyUsage(); - } - - @Override - public void updateNode() { - if (currentSlot >= importItems.getSlots()) { - currentSlot = 0; - } - - ItemStack slot = importItems.getStackInSlot(currentSlot); - - if (slot == null) { - currentSlot++; - } else if (ticks % upgrades.getSpeed() == 0) { - ItemStack remainder = network.insertItem(slot, upgrades.getInteractStackSize(), false); - - if (remainder == null) { - importItems.extractItemInternal(currentSlot, upgrades.getInteractStackSize(), false); - } else { - importItems.extractItemInternal(currentSlot, upgrades.getInteractStackSize() - remainder.stackSize, false); - currentSlot++; - } - } - - for (int i = 0; i < 9; ++i) { - ItemStack wanted = exportSpecimenItems.getStackInSlot(i); - ItemStack got = exportItems.getStackInSlot(i); - - if (wanted == null) { - if (got != null) { - exportItems.setStackInSlot(i, network.insertItem(got, got.stackSize, false)); - } - } else { - int delta = got == null ? wanted.stackSize : (wanted.stackSize - got.stackSize); - - if (delta > 0) { - ItemStack result = network.extractItem(wanted, delta, compare); - - if (result != null) { - if (got == null) { - exportItems.setStackInSlot(i, result); - } else { - exportItems.getStackInSlot(i).stackSize += result.stackSize; - } - } else { - network.scheduleCraftingTaskIfUnscheduled(wanted, delta, compare); - } - } else if (delta < 0) { - ItemStack remainder = network.insertItem(got, Math.abs(delta), false); - - if (remainder == null) { - exportItems.extractItem(i, Math.abs(delta), false); - } else { - exportItems.extractItem(i, Math.abs(delta) - remainder.stackSize, false); - } - } - } - } - } - - @Override - public int getCompare() { - return compare; - } - - @Override - public void setCompare(int compare) { - this.compare = compare; - - markDirty(); - } - - @Override - public void read(NBTTagCompound tag) { - super.read(tag); - - RSUtils.readItems(importItems, 0, tag); - RSUtils.readItems(exportSpecimenItems, 1, tag); - RSUtils.readItems(exportItems, 2, tag); - RSUtils.readItems(upgrades, 3, tag); - - if (tag.hasKey(NBT_COMPARE)) { - compare = tag.getInteger(NBT_COMPARE); - } - } - - @Override - public NBTTagCompound write(NBTTagCompound tag) { - super.write(tag); - - RSUtils.writeItems(importItems, 0, tag); - RSUtils.writeItems(exportSpecimenItems, 1, tag); - RSUtils.writeItems(exportItems, 2, tag); - RSUtils.writeItems(upgrades, 3, tag); - - tag.setInteger(NBT_COMPARE, compare); - - return tag; - } - - public IItemHandler getImportItems() { - return importItems; - } - - public IItemHandler getExportSpecimenItems() { - return exportSpecimenItems; - } - - public IItemHandler getExportItems() { - return exportItems; - } - - public IItemHandler getUpgrades() { - return upgrades; - } - - @Override - public IItemHandler getDrops() { - return new CombinedInvWrapper(importItems, exportItems, upgrades); - } - - @Override - public boolean hasConnectivityState() { - return true; - } - - @Override - public T getCapability(Capability capability, EnumFacing facing) { - if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { - return facing == EnumFacing.DOWN ? (T) exportItems : (T) importItems; - } - - return super.getCapability(capability, facing); - } - - @Override - public boolean hasCapability(Capability capability, EnumFacing facing) { - return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing); - } -} +package com.raoulvdberge.refinedstorage.tile; + +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade; +import com.raoulvdberge.refinedstorage.item.ItemUpgrade; +import com.raoulvdberge.refinedstorage.tile.config.IComparable; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.wrapper.CombinedInvWrapper; + +public class TileInterface extends TileNode implements IComparable { + public static final TileDataParameter COMPARE = IComparable.createParameter(); + + private static final String NBT_COMPARE = "Compare"; + + private ItemHandlerBasic importItems = new ItemHandlerBasic(9, this) { + @Override + public ItemStack extractItem(int slot, int amount, boolean simulate) { + return null; + } + }; + + private ItemHandlerBasic exportSpecimenItems = new ItemHandlerBasic(9, this); + private ItemHandlerBasic exportItems = new ItemHandlerBasic(9, this) { + @Override + public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + return stack; + } + }; + + private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, this, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK, ItemUpgrade.TYPE_CRAFTING); + + private int compare = IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE; + + private int currentSlot = 0; + + public TileInterface() { + dataManager.addWatchedParameter(COMPARE); + } + + @Override + public int getEnergyUsage() { + return RS.INSTANCE.config.interfaceUsage + upgrades.getEnergyUsage(); + } + + @Override + public void updateNode() { + if (currentSlot >= importItems.getSlots()) { + currentSlot = 0; + } + + ItemStack slot = importItems.getStackInSlot(currentSlot); + + if (slot == null) { + currentSlot++; + } else if (ticks % upgrades.getSpeed() == 0) { + ItemStack remainder = network.insertItem(slot, upgrades.getInteractStackSize(), false); + + if (remainder == null) { + importItems.extractItemInternal(currentSlot, upgrades.getInteractStackSize(), false); + } else { + importItems.extractItemInternal(currentSlot, upgrades.getInteractStackSize() - remainder.stackSize, false); + currentSlot++; + } + } + + for (int i = 0; i < 9; ++i) { + ItemStack wanted = exportSpecimenItems.getStackInSlot(i); + ItemStack got = exportItems.getStackInSlot(i); + + if (wanted == null) { + if (got != null) { + exportItems.setStackInSlot(i, network.insertItem(got, got.stackSize, false)); + } + } else { + int delta = got == null ? wanted.stackSize : (wanted.stackSize - got.stackSize); + + if (delta > 0) { + ItemStack result = network.extractItem(wanted, delta, compare); + + if (result != null) { + if (got == null) { + exportItems.setStackInSlot(i, result); + } else { + exportItems.getStackInSlot(i).stackSize += result.stackSize; + } + } else { + network.scheduleCraftingTaskIfUnscheduled(wanted, delta, compare); + } + } else if (delta < 0) { + ItemStack remainder = network.insertItem(got, Math.abs(delta), false); + + if (remainder == null) { + exportItems.extractItem(i, Math.abs(delta), false); + } else { + exportItems.extractItem(i, Math.abs(delta) - remainder.stackSize, false); + } + } + } + } + } + + @Override + public int getCompare() { + return compare; + } + + @Override + public void setCompare(int compare) { + this.compare = compare; + + markDirty(); + } + + @Override + public void read(NBTTagCompound tag) { + super.read(tag); + + RSUtils.readItems(importItems, 0, tag); + RSUtils.readItems(exportSpecimenItems, 1, tag); + RSUtils.readItems(exportItems, 2, tag); + RSUtils.readItems(upgrades, 3, tag); + + if (tag.hasKey(NBT_COMPARE)) { + compare = tag.getInteger(NBT_COMPARE); + } + } + + @Override + public NBTTagCompound write(NBTTagCompound tag) { + super.write(tag); + + RSUtils.writeItems(importItems, 0, tag); + RSUtils.writeItems(exportSpecimenItems, 1, tag); + RSUtils.writeItems(exportItems, 2, tag); + RSUtils.writeItems(upgrades, 3, tag); + + tag.setInteger(NBT_COMPARE, compare); + + return tag; + } + + public IItemHandler getImportItems() { + return importItems; + } + + public IItemHandler getExportSpecimenItems() { + return exportSpecimenItems; + } + + public IItemHandler getExportItems() { + return exportItems; + } + + public IItemHandler getUpgrades() { + return upgrades; + } + + @Override + public IItemHandler getDrops() { + return new CombinedInvWrapper(importItems, exportItems, upgrades); + } + + @Override + public boolean hasConnectivityState() { + return true; + } + + @Override + public T getCapability(Capability capability, EnumFacing facing) { + if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { + return facing == EnumFacing.DOWN ? (T) exportItems : (T) importItems; + } + + return super.getCapability(capability, facing); + } + + @Override + public boolean hasCapability(Capability capability, EnumFacing facing) { + return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing); + } +} diff --git a/src/main/java/refinedstorage/tile/TileMultipartNode.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileMultipartNode.java similarity index 98% rename from src/main/java/refinedstorage/tile/TileMultipartNode.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileMultipartNode.java index e89d8d37d..575bc5714 100755 --- a/src/main/java/refinedstorage/tile/TileMultipartNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileMultipartNode.java @@ -1,5 +1,6 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; +import com.raoulvdberge.refinedstorage.RSBlocks; import mcmultipart.capabilities.ISlottedCapabilityProvider; import mcmultipart.capabilities.MultipartCapabilityHelper; import mcmultipart.microblock.IMicroblock; @@ -16,7 +17,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; -import refinedstorage.RSBlocks; public abstract class TileMultipartNode extends TileNode implements IMicroblockContainerTile, ISlottedCapabilityProvider { private MicroblockContainer container; diff --git a/src/main/java/refinedstorage/tile/TileNetworkReceiver.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkReceiver.java similarity index 71% rename from src/main/java/refinedstorage/tile/TileNetworkReceiver.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkReceiver.java index d7ed75052..fd2be0afb 100755 --- a/src/main/java/refinedstorage/tile/TileNetworkReceiver.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkReceiver.java @@ -1,7 +1,7 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; -import refinedstorage.RS; -import refinedstorage.tile.config.RedstoneMode; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode; public class TileNetworkReceiver extends TileNode { @Override diff --git a/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java similarity index 87% rename from src/main/java/refinedstorage/tile/TileNetworkTransmitter.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java index 52090efdf..ba544422a 100755 --- a/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java @@ -1,21 +1,21 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade; +import com.raoulvdberge.refinedstorage.inventory.ItemValidatorBasic; +import com.raoulvdberge.refinedstorage.item.ItemNetworkCard; +import com.raoulvdberge.refinedstorage.item.ItemUpgrade; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.util.math.BlockPos; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.CombinedInvWrapper; -import refinedstorage.RS; -import refinedstorage.RSItems; -import refinedstorage.RSUtils; -import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.inventory.ItemHandlerUpgrade; -import refinedstorage.inventory.ItemValidatorBasic; -import refinedstorage.item.ItemNetworkCard; -import refinedstorage.item.ItemUpgrade; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.TileDataParameter; public class TileNetworkTransmitter extends TileNode { public static final TileDataParameter DISTANCE = new TileDataParameter<>(DataSerializers.VARINT, 0, new ITileDataProducer() { diff --git a/src/main/java/refinedstorage/tile/TileNode.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java similarity index 91% rename from src/main/java/refinedstorage/tile/TileNode.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java index 379b441c0..f6792cecf 100755 --- a/src/main/java/refinedstorage/tile/TileNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java @@ -1,15 +1,15 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.api.network.INetworkNode; +import com.raoulvdberge.refinedstorage.tile.config.IRedstoneConfigurable; +import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.network.INetworkNode; -import refinedstorage.tile.config.IRedstoneConfigurable; -import refinedstorage.tile.config.RedstoneMode; -import refinedstorage.tile.data.TileDataParameter; public abstract class TileNode extends TileBase implements INetworkNode, IRedstoneConfigurable { public static final TileDataParameter REDSTONE_MODE = RedstoneMode.createParameter(); diff --git a/src/main/java/refinedstorage/tile/TileProcessingPatternEncoder.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileProcessingPatternEncoder.java similarity index 90% rename from src/main/java/refinedstorage/tile/TileProcessingPatternEncoder.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileProcessingPatternEncoder.java index f7dfbf17e..ca07ce9d5 100755 --- a/src/main/java/refinedstorage/tile/TileProcessingPatternEncoder.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileProcessingPatternEncoder.java @@ -1,5 +1,10 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; +import com.raoulvdberge.refinedstorage.inventory.ItemValidatorBasic; +import com.raoulvdberge.refinedstorage.item.ItemPattern; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; @@ -7,11 +12,6 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; -import refinedstorage.RSItems; -import refinedstorage.RSUtils; -import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.inventory.ItemValidatorBasic; -import refinedstorage.item.ItemPattern; public class TileProcessingPatternEncoder extends TileBase { private ItemHandlerBasic patterns = new ItemHandlerBasic(2, this, new ItemValidatorBasic(RSItems.PATTERN)); diff --git a/src/main/java/refinedstorage/tile/TileRelay.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileRelay.java similarity index 79% rename from src/main/java/refinedstorage/tile/TileRelay.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileRelay.java index a58055ffa..24c38eb6b 100755 --- a/src/main/java/refinedstorage/tile/TileRelay.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileRelay.java @@ -1,32 +1,32 @@ -package refinedstorage.tile; - -import net.minecraft.util.EnumFacing; -import refinedstorage.RS; -import refinedstorage.tile.config.RedstoneMode; - -public class TileRelay extends TileNode { - public TileRelay() { - setRedstoneMode(RedstoneMode.LOW); - - rebuildOnUpdateChange = true; - } - - @Override - public int getEnergyUsage() { - return getRedstoneMode() == RedstoneMode.IGNORE ? 0 : RS.INSTANCE.config.relayUsage; - } - - @Override - public void updateNode() { - } - - @Override - public boolean canConduct(EnumFacing direction) { - return canUpdate(); - } - - @Override - public boolean hasConnectivityState() { - return true; - } -} +package com.raoulvdberge.refinedstorage.tile; + +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode; +import net.minecraft.util.EnumFacing; + +public class TileRelay extends TileNode { + public TileRelay() { + setRedstoneMode(RedstoneMode.LOW); + + rebuildOnUpdateChange = true; + } + + @Override + public int getEnergyUsage() { + return getRedstoneMode() == RedstoneMode.IGNORE ? 0 : RS.INSTANCE.config.relayUsage; + } + + @Override + public void updateNode() { + } + + @Override + public boolean canConduct(EnumFacing direction) { + return canUpdate(); + } + + @Override + public boolean hasConnectivityState() { + return true; + } +} diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java similarity index 91% rename from src/main/java/refinedstorage/tile/TileSolderer.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java index cb8a41836..2881c4210 100755 --- a/src/main/java/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java @@ -1,5 +1,15 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRecipe; +import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade; +import com.raoulvdberge.refinedstorage.item.ItemUpgrade; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataSerializers; @@ -8,16 +18,6 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.CombinedInvWrapper; -import refinedstorage.RS; -import refinedstorage.RSUtils; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.solderer.ISoldererRecipe; -import refinedstorage.apiimpl.API; -import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.inventory.ItemHandlerUpgrade; -import refinedstorage.item.ItemUpgrade; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.TileDataParameter; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorage.java similarity index 88% rename from src/main/java/refinedstorage/tile/TileStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorage.java index 6b5ad7c82..796d8e55f 100755 --- a/src/main/java/refinedstorage/tile/TileStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorage.java @@ -1,335 +1,335 @@ -package refinedstorage.tile; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.datasync.DataSerializers; -import net.minecraftforge.items.ItemHandlerHelper; -import refinedstorage.RS; -import refinedstorage.RSBlocks; -import refinedstorage.RSUtils; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.storage.AccessType; -import refinedstorage.api.storage.item.IItemStorage; -import refinedstorage.api.storage.item.IItemStorageProvider; -import refinedstorage.api.util.IComparer; -import refinedstorage.apiimpl.storage.item.ItemStorageNBT; -import refinedstorage.block.BlockStorage; -import refinedstorage.block.EnumItemStorageType; -import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.tile.config.*; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.TileDataParameter; - -import java.util.List; - -public class TileStorage extends TileNode implements IItemStorageProvider, IStorageGui, IComparable, IFilterable, IPrioritizable, IExcessVoidable, IAccessType { - public static final TileDataParameter PRIORITY = IPrioritizable.createParameter(); - public static final TileDataParameter COMPARE = IComparable.createParameter(); - public static final TileDataParameter MODE = IFilterable.createParameter(); - public static final TileDataParameter ACCESS_TYPE = IAccessType.createParameter(); - public static final TileDataParameter STORED = new TileDataParameter<>(DataSerializers.VARINT, 0, new ITileDataProducer() { - @Override - public Integer getValue(TileStorage tile) { - return ItemStorageNBT.getStoredFromNBT(tile.storageTag); - } - }); - public static final TileDataParameter VOID_EXCESS = IExcessVoidable.createParameter(); - - class ItemStorage extends ItemStorageNBT { - public ItemStorage() { - super(TileStorage.this.getStorageTag(), TileStorage.this.getCapacity(), TileStorage.this); - } - - @Override - public int getPriority() { - return priority; - } - - @Override - public ItemStack insertItem(ItemStack stack, int size, boolean simulate) { - if (!IFilterable.canTake(filters, mode, compare, stack)) { - return ItemHandlerHelper.copyStackWithSize(stack, size); - } - - ItemStack result = super.insertItem(stack, size, simulate); - - if (voidExcess && result != null) { - // Simulate should not matter as the items are voided anyway - result.stackSize = -result.stackSize; - } - - return result; - } - - @Override - public AccessType getAccessType() { - return accessType; - } - } - - public static final String NBT_STORAGE = "Storage"; - - private static final String NBT_PRIORITY = "Priority"; - private static final String NBT_COMPARE = "Compare"; - private static final String NBT_MODE = "Mode"; - private static final String NBT_VOID_EXCESS = "VoidExcess"; - - private ItemHandlerBasic filters = new ItemHandlerBasic(9, this); - - private NBTTagCompound storageTag = ItemStorageNBT.createNBT(); - - private ItemStorage storage; - - private EnumItemStorageType type; - - private AccessType accessType = AccessType.READ_WRITE; - private int priority = 0; - private int compare = IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE; - private int mode = IFilterable.WHITELIST; - private boolean voidExcess = false; - - public TileStorage() { - dataManager.addWatchedParameter(PRIORITY); - dataManager.addWatchedParameter(COMPARE); - dataManager.addWatchedParameter(MODE); - dataManager.addWatchedParameter(STORED); - dataManager.addWatchedParameter(VOID_EXCESS); - dataManager.addWatchedParameter(ACCESS_TYPE); - } - - @Override - public int getEnergyUsage() { - return RS.INSTANCE.config.storageUsage; - } - - @Override - public void updateNode() { - } - - @Override - public void update() { - super.update(); - - if (storage == null && storageTag != null) { - storage = new ItemStorage(); - - if (network != null) { - network.getItemStorageCache().invalidate(); - } - } - } - - public void onBreak() { - if (storage != null) { - storage.writeToNBT(); - } - } - - @Override - public void onConnectionChange(INetworkMaster network, boolean state) { - super.onConnectionChange(network, state); - - network.getItemStorageCache().invalidate(); - } - - @Override - public void addItemStorages(List storages) { - if (storage != null) { - storages.add(storage); - } - } - - @Override - public void read(NBTTagCompound tag) { - super.read(tag); - - RSUtils.readItems(filters, 0, tag); - - if (tag.hasKey(NBT_PRIORITY)) { - priority = tag.getInteger(NBT_PRIORITY); - } - - if (tag.hasKey(NBT_STORAGE)) { - storageTag = tag.getCompoundTag(NBT_STORAGE); - } - - if (tag.hasKey(NBT_COMPARE)) { - compare = tag.getInteger(NBT_COMPARE); - } - - if (tag.hasKey(NBT_MODE)) { - mode = tag.getInteger(NBT_MODE); - } - - if (tag.hasKey(NBT_VOID_EXCESS)) { - voidExcess = tag.getBoolean(NBT_VOID_EXCESS); - } - - accessType = RSUtils.readAccessType(tag); - } - - @Override - public NBTTagCompound write(NBTTagCompound tag) { - super.write(tag); - - RSUtils.writeItems(filters, 0, tag); - - tag.setInteger(NBT_PRIORITY, priority); - - if (storage != null) { - storage.writeToNBT(); - } - - tag.setTag(NBT_STORAGE, storageTag); - tag.setInteger(NBT_COMPARE, compare); - tag.setInteger(NBT_MODE, mode); - tag.setBoolean(NBT_VOID_EXCESS, voidExcess); - - RSUtils.writeAccessType(tag, accessType); - - return tag; - } - - public EnumItemStorageType getType() { - if (type == null && worldObj.getBlockState(pos).getBlock() == RSBlocks.STORAGE) { - this.type = ((EnumItemStorageType) worldObj.getBlockState(pos).getValue(BlockStorage.TYPE)); - } - - return type == null ? EnumItemStorageType.TYPE_1K : type; - } - - @Override - public int getCompare() { - return compare; - } - - @Override - public void setCompare(int compare) { - this.compare = compare; - - markDirty(); - } - - @Override - public int getMode() { - return mode; - } - - @Override - public void setMode(int mode) { - this.mode = mode; - - markDirty(); - } - - @Override - public boolean getVoidExcess() { - return voidExcess; - } - - @Override - public void setVoidExcess(boolean voidExcess) { - this.voidExcess = voidExcess; - - markDirty(); - } - - @Override - public String getGuiTitle() { - return "block.refinedstorage:storage." + getType().getId() + ".name"; - } - - @Override - public TileDataParameter getTypeParameter() { - return null; - } - - @Override - public TileDataParameter getRedstoneModeParameter() { - return REDSTONE_MODE; - } - - @Override - public TileDataParameter getCompareParameter() { - return COMPARE; - } - - @Override - public TileDataParameter getFilterParameter() { - return MODE; - } - - @Override - public TileDataParameter getPriorityParameter() { - return PRIORITY; - } - - @Override - public TileDataParameter getVoidExcessParameter() { - return VOID_EXCESS; - } - - @Override - public TileDataParameter getAccessTypeParameter() { - return ACCESS_TYPE; - } - - @Override - public String getVoidExcessType() { - return "items"; - } - - public NBTTagCompound getStorageTag() { - return storageTag; - } - - public void setStorageTag(NBTTagCompound storageTag) { - this.storageTag = storageTag; - } - - public ItemStorageNBT getStorage() { - return storage; - } - - public ItemHandlerBasic getFilters() { - return filters; - } - - @Override - public AccessType getAccessType() { - return accessType; - } - - @Override - public void setAccessType(AccessType value) { - this.accessType = value; - - if (network != null) { - network.getItemStorageCache().invalidate(); - } - - markDirty(); - } - - @Override - public int getPriority() { - return priority; - } - - @Override - public void setPriority(int priority) { - this.priority = priority; - - markDirty(); - } - - @Override - public int getStored() { - return STORED.getValue(); - } - - @Override - public int getCapacity() { - return getType().getCapacity(); - } -} +package com.raoulvdberge.refinedstorage.tile; + +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorage; +import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorageProvider; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.apiimpl.storage.item.ItemStorageNBT; +import com.raoulvdberge.refinedstorage.block.BlockStorage; +import com.raoulvdberge.refinedstorage.block.EnumItemStorageType; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; +import com.raoulvdberge.refinedstorage.tile.config.*; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraftforge.items.ItemHandlerHelper; + +import java.util.List; + +public class TileStorage extends TileNode implements IItemStorageProvider, IStorageGui, IComparable, IFilterable, IPrioritizable, IExcessVoidable, IAccessType { + public static final TileDataParameter PRIORITY = IPrioritizable.createParameter(); + public static final TileDataParameter COMPARE = IComparable.createParameter(); + public static final TileDataParameter MODE = IFilterable.createParameter(); + public static final TileDataParameter ACCESS_TYPE = IAccessType.createParameter(); + public static final TileDataParameter STORED = new TileDataParameter<>(DataSerializers.VARINT, 0, new ITileDataProducer() { + @Override + public Integer getValue(TileStorage tile) { + return ItemStorageNBT.getStoredFromNBT(tile.storageTag); + } + }); + public static final TileDataParameter VOID_EXCESS = IExcessVoidable.createParameter(); + + class ItemStorage extends ItemStorageNBT { + public ItemStorage() { + super(TileStorage.this.getStorageTag(), TileStorage.this.getCapacity(), TileStorage.this); + } + + @Override + public int getPriority() { + return priority; + } + + @Override + public ItemStack insertItem(ItemStack stack, int size, boolean simulate) { + if (!IFilterable.canTake(filters, mode, compare, stack)) { + return ItemHandlerHelper.copyStackWithSize(stack, size); + } + + ItemStack result = super.insertItem(stack, size, simulate); + + if (voidExcess && result != null) { + // Simulate should not matter as the items are voided anyway + result.stackSize = -result.stackSize; + } + + return result; + } + + @Override + public AccessType getAccessType() { + return accessType; + } + } + + public static final String NBT_STORAGE = "Storage"; + + private static final String NBT_PRIORITY = "Priority"; + private static final String NBT_COMPARE = "Compare"; + private static final String NBT_MODE = "Mode"; + private static final String NBT_VOID_EXCESS = "VoidExcess"; + + private ItemHandlerBasic filters = new ItemHandlerBasic(9, this); + + private NBTTagCompound storageTag = ItemStorageNBT.createNBT(); + + private ItemStorage storage; + + private EnumItemStorageType type; + + private AccessType accessType = AccessType.READ_WRITE; + private int priority = 0; + private int compare = IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE; + private int mode = IFilterable.WHITELIST; + private boolean voidExcess = false; + + public TileStorage() { + dataManager.addWatchedParameter(PRIORITY); + dataManager.addWatchedParameter(COMPARE); + dataManager.addWatchedParameter(MODE); + dataManager.addWatchedParameter(STORED); + dataManager.addWatchedParameter(VOID_EXCESS); + dataManager.addWatchedParameter(ACCESS_TYPE); + } + + @Override + public int getEnergyUsage() { + return RS.INSTANCE.config.storageUsage; + } + + @Override + public void updateNode() { + } + + @Override + public void update() { + super.update(); + + if (storage == null && storageTag != null) { + storage = new ItemStorage(); + + if (network != null) { + network.getItemStorageCache().invalidate(); + } + } + } + + public void onBreak() { + if (storage != null) { + storage.writeToNBT(); + } + } + + @Override + public void onConnectionChange(INetworkMaster network, boolean state) { + super.onConnectionChange(network, state); + + network.getItemStorageCache().invalidate(); + } + + @Override + public void addItemStorages(List storages) { + if (storage != null) { + storages.add(storage); + } + } + + @Override + public void read(NBTTagCompound tag) { + super.read(tag); + + RSUtils.readItems(filters, 0, tag); + + if (tag.hasKey(NBT_PRIORITY)) { + priority = tag.getInteger(NBT_PRIORITY); + } + + if (tag.hasKey(NBT_STORAGE)) { + storageTag = tag.getCompoundTag(NBT_STORAGE); + } + + if (tag.hasKey(NBT_COMPARE)) { + compare = tag.getInteger(NBT_COMPARE); + } + + if (tag.hasKey(NBT_MODE)) { + mode = tag.getInteger(NBT_MODE); + } + + if (tag.hasKey(NBT_VOID_EXCESS)) { + voidExcess = tag.getBoolean(NBT_VOID_EXCESS); + } + + accessType = RSUtils.readAccessType(tag); + } + + @Override + public NBTTagCompound write(NBTTagCompound tag) { + super.write(tag); + + RSUtils.writeItems(filters, 0, tag); + + tag.setInteger(NBT_PRIORITY, priority); + + if (storage != null) { + storage.writeToNBT(); + } + + tag.setTag(NBT_STORAGE, storageTag); + tag.setInteger(NBT_COMPARE, compare); + tag.setInteger(NBT_MODE, mode); + tag.setBoolean(NBT_VOID_EXCESS, voidExcess); + + RSUtils.writeAccessType(tag, accessType); + + return tag; + } + + public EnumItemStorageType getType() { + if (type == null && worldObj.getBlockState(pos).getBlock() == RSBlocks.STORAGE) { + this.type = ((EnumItemStorageType) worldObj.getBlockState(pos).getValue(BlockStorage.TYPE)); + } + + return type == null ? EnumItemStorageType.TYPE_1K : type; + } + + @Override + public int getCompare() { + return compare; + } + + @Override + public void setCompare(int compare) { + this.compare = compare; + + markDirty(); + } + + @Override + public int getMode() { + return mode; + } + + @Override + public void setMode(int mode) { + this.mode = mode; + + markDirty(); + } + + @Override + public boolean getVoidExcess() { + return voidExcess; + } + + @Override + public void setVoidExcess(boolean voidExcess) { + this.voidExcess = voidExcess; + + markDirty(); + } + + @Override + public String getGuiTitle() { + return "block.refinedstorage:storage." + getType().getId() + ".name"; + } + + @Override + public TileDataParameter getTypeParameter() { + return null; + } + + @Override + public TileDataParameter getRedstoneModeParameter() { + return REDSTONE_MODE; + } + + @Override + public TileDataParameter getCompareParameter() { + return COMPARE; + } + + @Override + public TileDataParameter getFilterParameter() { + return MODE; + } + + @Override + public TileDataParameter getPriorityParameter() { + return PRIORITY; + } + + @Override + public TileDataParameter getVoidExcessParameter() { + return VOID_EXCESS; + } + + @Override + public TileDataParameter getAccessTypeParameter() { + return ACCESS_TYPE; + } + + @Override + public String getVoidExcessType() { + return "items"; + } + + public NBTTagCompound getStorageTag() { + return storageTag; + } + + public void setStorageTag(NBTTagCompound storageTag) { + this.storageTag = storageTag; + } + + public ItemStorageNBT getStorage() { + return storage; + } + + public ItemHandlerBasic getFilters() { + return filters; + } + + @Override + public AccessType getAccessType() { + return accessType; + } + + @Override + public void setAccessType(AccessType value) { + this.accessType = value; + + if (network != null) { + network.getItemStorageCache().invalidate(); + } + + markDirty(); + } + + @Override + public int getPriority() { + return priority; + } + + @Override + public void setPriority(int priority) { + this.priority = priority; + + markDirty(); + } + + @Override + public int getStored() { + return STORED.getValue(); + } + + @Override + public int getCapacity() { + return getType().getCapacity(); + } +} diff --git a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWirelessTransmitter.java similarity index 82% rename from src/main/java/refinedstorage/tile/TileWirelessTransmitter.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/TileWirelessTransmitter.java index 27ae8dd64..ff668e22d 100755 --- a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWirelessTransmitter.java @@ -1,5 +1,13 @@ -package refinedstorage.tile; +package com.raoulvdberge.refinedstorage.tile; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.network.IWirelessTransmitter; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade; +import com.raoulvdberge.refinedstorage.item.ItemUpgrade; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.util.EnumFacing; @@ -7,14 +15,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; -import refinedstorage.RS; -import refinedstorage.RSUtils; -import refinedstorage.api.network.IWirelessTransmitter; -import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.inventory.ItemHandlerUpgrade; -import refinedstorage.item.ItemUpgrade; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.TileDataParameter; public class TileWirelessTransmitter extends TileNode implements IWirelessTransmitter { public static final TileDataParameter RANGE = new TileDataParameter<>(DataSerializers.VARINT, 0, new ITileDataProducer() { diff --git a/src/main/java/refinedstorage/tile/config/IAccessType.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IAccessType.java similarity index 66% rename from src/main/java/refinedstorage/tile/config/IAccessType.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/config/IAccessType.java index ac4da6acd..b9aa6b83c 100755 --- a/src/main/java/refinedstorage/tile/config/IAccessType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IAccessType.java @@ -1,11 +1,11 @@ -package refinedstorage.tile.config; +package com.raoulvdberge.refinedstorage.tile.config; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataConsumer; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.RSSerializers; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.tileentity.TileEntity; -import refinedstorage.api.storage.AccessType; -import refinedstorage.tile.data.ITileDataConsumer; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.RSSerializers; -import refinedstorage.tile.data.TileDataParameter; public interface IAccessType { static TileDataParameter createParameter() { diff --git a/src/main/java/refinedstorage/tile/config/IComparable.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IComparable.java similarity index 74% rename from src/main/java/refinedstorage/tile/config/IComparable.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/config/IComparable.java index 3c3c94366..36fb4bdfc 100755 --- a/src/main/java/refinedstorage/tile/config/IComparable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IComparable.java @@ -1,10 +1,10 @@ -package refinedstorage.tile.config; +package com.raoulvdberge.refinedstorage.tile.config; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataConsumer; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.tileentity.TileEntity; -import refinedstorage.tile.data.ITileDataConsumer; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.TileDataParameter; public interface IComparable { static TileDataParameter createParameter() { diff --git a/src/main/java/refinedstorage/tile/config/IExcessVoidable.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IExcessVoidable.java old mode 100644 new mode 100755 similarity index 75% rename from src/main/java/refinedstorage/tile/config/IExcessVoidable.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/config/IExcessVoidable.java index df9350eb7..8047c40d7 --- a/src/main/java/refinedstorage/tile/config/IExcessVoidable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IExcessVoidable.java @@ -1,27 +1,27 @@ -package refinedstorage.tile.config; - -import net.minecraft.network.datasync.DataSerializers; -import net.minecraft.tileentity.TileEntity; -import refinedstorage.tile.data.ITileDataConsumer; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.TileDataParameter; - -public interface IExcessVoidable { - static TileDataParameter createParameter() { - return new TileDataParameter<>(DataSerializers.BOOLEAN, false, new ITileDataProducer() { - @Override - public Boolean getValue(T tile) { - return ((IExcessVoidable) tile).getVoidExcess(); - } - }, new ITileDataConsumer() { - @Override - public void setValue(T tile, Boolean value) { - ((IExcessVoidable) tile).setVoidExcess(value); - } - }); - } - - boolean getVoidExcess(); - - void setVoidExcess(boolean voidExcess); -} +package com.raoulvdberge.refinedstorage.tile.config; + +import com.raoulvdberge.refinedstorage.tile.data.ITileDataConsumer; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.tileentity.TileEntity; + +public interface IExcessVoidable { + static TileDataParameter createParameter() { + return new TileDataParameter<>(DataSerializers.BOOLEAN, false, new ITileDataProducer() { + @Override + public Boolean getValue(T tile) { + return ((IExcessVoidable) tile).getVoidExcess(); + } + }, new ITileDataConsumer() { + @Override + public void setValue(T tile, Boolean value) { + ((IExcessVoidable) tile).setVoidExcess(value); + } + }); + } + + boolean getVoidExcess(); + + void setVoidExcess(boolean voidExcess); +} diff --git a/src/main/java/refinedstorage/tile/config/IFilterable.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IFilterable.java similarity index 89% rename from src/main/java/refinedstorage/tile/config/IFilterable.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/config/IFilterable.java index 477378f68..84945d948 100755 --- a/src/main/java/refinedstorage/tile/config/IFilterable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IFilterable.java @@ -1,15 +1,15 @@ -package refinedstorage.tile.config; +package com.raoulvdberge.refinedstorage.tile.config; +import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataConsumer; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.item.ItemStack; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.items.IItemHandler; -import refinedstorage.apiimpl.API; -import refinedstorage.inventory.ItemHandlerFluid; -import refinedstorage.tile.data.ITileDataConsumer; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.TileDataParameter; public interface IFilterable { int WHITELIST = 0; diff --git a/src/main/java/refinedstorage/tile/config/IPrioritizable.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IPrioritizable.java similarity index 76% rename from src/main/java/refinedstorage/tile/config/IPrioritizable.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/config/IPrioritizable.java index c23abf188..5f82611b7 100755 --- a/src/main/java/refinedstorage/tile/config/IPrioritizable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IPrioritizable.java @@ -1,12 +1,12 @@ -package refinedstorage.tile.config; +package com.raoulvdberge.refinedstorage.tile.config; +import com.raoulvdberge.refinedstorage.gui.GuiStorage; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataConsumer; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.client.Minecraft; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.tileentity.TileEntity; -import refinedstorage.gui.GuiStorage; -import refinedstorage.tile.data.ITileDataConsumer; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.TileDataParameter; public interface IPrioritizable { static TileDataParameter createParameter() { diff --git a/src/main/java/refinedstorage/tile/config/IRedstoneConfigurable.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IRedstoneConfigurable.java similarity index 70% rename from src/main/java/refinedstorage/tile/config/IRedstoneConfigurable.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/config/IRedstoneConfigurable.java index 6a4e4d830..0b16e798c 100755 --- a/src/main/java/refinedstorage/tile/config/IRedstoneConfigurable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IRedstoneConfigurable.java @@ -1,4 +1,4 @@ -package refinedstorage.tile.config; +package com.raoulvdberge.refinedstorage.tile.config; public interface IRedstoneConfigurable { RedstoneMode getRedstoneMode(); diff --git a/src/main/java/refinedstorage/tile/config/IType.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IType.java similarity index 78% rename from src/main/java/refinedstorage/tile/config/IType.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/config/IType.java index 63db8ccdc..bbe383c2a 100755 --- a/src/main/java/refinedstorage/tile/config/IType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IType.java @@ -1,12 +1,12 @@ -package refinedstorage.tile.config; +package com.raoulvdberge.refinedstorage.tile.config; +import com.raoulvdberge.refinedstorage.container.ContainerBase; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataConsumer; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.items.IItemHandler; -import refinedstorage.container.ContainerBase; -import refinedstorage.tile.data.ITileDataConsumer; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.TileDataParameter; public interface IType { int ITEMS = 0; diff --git a/src/main/java/refinedstorage/tile/config/RedstoneMode.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/RedstoneMode.java similarity index 86% rename from src/main/java/refinedstorage/tile/config/RedstoneMode.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/config/RedstoneMode.java index 1307b8497..223ef3d74 100755 --- a/src/main/java/refinedstorage/tile/config/RedstoneMode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/RedstoneMode.java @@ -1,13 +1,13 @@ -package refinedstorage.tile.config; +package com.raoulvdberge.refinedstorage.tile.config; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataConsumer; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import refinedstorage.tile.data.ITileDataConsumer; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.TileDataParameter; public enum RedstoneMode { IGNORE, HIGH, LOW; diff --git a/src/main/java/refinedstorage/tile/data/ContainerListener.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/ContainerListener.java similarity index 80% rename from src/main/java/refinedstorage/tile/data/ContainerListener.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/data/ContainerListener.java index e82717803..602d7b776 100755 --- a/src/main/java/refinedstorage/tile/data/ContainerListener.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/ContainerListener.java @@ -1,11 +1,11 @@ -package refinedstorage.tile.data; +package com.raoulvdberge.refinedstorage.tile.data; +import com.raoulvdberge.refinedstorage.container.ContainerBase; +import com.raoulvdberge.refinedstorage.tile.TileBase; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraftforge.event.entity.player.PlayerContainerEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import refinedstorage.container.ContainerBase; -import refinedstorage.tile.TileBase; public class ContainerListener { @SubscribeEvent diff --git a/src/main/java/refinedstorage/tile/data/ITileDataConsumer.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/ITileDataConsumer.java similarity index 74% rename from src/main/java/refinedstorage/tile/data/ITileDataConsumer.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/data/ITileDataConsumer.java index 03fafd823..1c792cdad 100755 --- a/src/main/java/refinedstorage/tile/data/ITileDataConsumer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/ITileDataConsumer.java @@ -1,4 +1,4 @@ -package refinedstorage.tile.data; +package com.raoulvdberge.refinedstorage.tile.data; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/refinedstorage/tile/data/ITileDataListener.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/ITileDataListener.java similarity index 65% rename from src/main/java/refinedstorage/tile/data/ITileDataListener.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/data/ITileDataListener.java index 79114d194..2406be162 100755 --- a/src/main/java/refinedstorage/tile/data/ITileDataListener.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/ITileDataListener.java @@ -1,4 +1,4 @@ -package refinedstorage.tile.data; +package com.raoulvdberge.refinedstorage.tile.data; public interface ITileDataListener { void onChanged(TileDataParameter parameter); diff --git a/src/main/java/refinedstorage/tile/data/ITileDataProducer.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/ITileDataProducer.java similarity index 72% rename from src/main/java/refinedstorage/tile/data/ITileDataProducer.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/data/ITileDataProducer.java index 1a8bd948c..326ccf798 100755 --- a/src/main/java/refinedstorage/tile/data/ITileDataProducer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/ITileDataProducer.java @@ -1,4 +1,4 @@ -package refinedstorage.tile.data; +package com.raoulvdberge.refinedstorage.tile.data; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/refinedstorage/tile/data/RSSerializers.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/RSSerializers.java similarity index 92% rename from src/main/java/refinedstorage/tile/data/RSSerializers.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/data/RSSerializers.java index 0fff694bc..877060cb6 100755 --- a/src/main/java/refinedstorage/tile/data/RSSerializers.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/RSSerializers.java @@ -1,5 +1,10 @@ -package refinedstorage.tile.data; +package com.raoulvdberge.refinedstorage.tile.data; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.tile.ClientNode; import io.netty.buffer.ByteBuf; import net.minecraft.network.PacketBuffer; import net.minecraft.network.datasync.DataParameter; @@ -7,11 +12,6 @@ import net.minecraft.network.datasync.DataSerializer; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.network.ByteBufUtils; -import refinedstorage.RSUtils; -import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; -import refinedstorage.api.storage.AccessType; -import refinedstorage.apiimpl.API; -import refinedstorage.tile.ClientNode; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/refinedstorage/tile/data/TileDataManager.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataManager.java similarity index 89% rename from src/main/java/refinedstorage/tile/data/TileDataManager.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataManager.java index 33664845f..eda502c03 100755 --- a/src/main/java/refinedstorage/tile/data/TileDataManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataManager.java @@ -1,14 +1,14 @@ -package refinedstorage.tile.data; +package com.raoulvdberge.refinedstorage.tile.data; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.container.ContainerBase; +import com.raoulvdberge.refinedstorage.network.MessageTileDataParameter; +import com.raoulvdberge.refinedstorage.network.MessageTileDataParameterUpdate; +import com.raoulvdberge.refinedstorage.tile.TileBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraft.tileentity.TileEntity; -import refinedstorage.RS; -import refinedstorage.container.ContainerBase; -import refinedstorage.network.MessageTileDataParameter; -import refinedstorage.network.MessageTileDataParameterUpdate; -import refinedstorage.tile.TileBase; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/refinedstorage/tile/data/TileDataParameter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataParameter.java similarity index 97% rename from src/main/java/refinedstorage/tile/data/TileDataParameter.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataParameter.java index 26e7aa0c1..e5da28408 100755 --- a/src/main/java/refinedstorage/tile/data/TileDataParameter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataParameter.java @@ -1,4 +1,4 @@ -package refinedstorage.tile.data; +package com.raoulvdberge.refinedstorage.tile.data; import net.minecraft.network.datasync.DataSerializer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/refinedstorage/tile/externalstorage/FluidStorageExternal.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/FluidStorageExternal.java similarity index 87% rename from src/main/java/refinedstorage/tile/externalstorage/FluidStorageExternal.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/FluidStorageExternal.java index e909e5d0b..2d03367f1 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/FluidStorageExternal.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/FluidStorageExternal.java @@ -1,14 +1,14 @@ -package refinedstorage.tile.externalstorage; +package com.raoulvdberge.refinedstorage.tile.externalstorage; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorage; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.tile.config.IFilterable; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidTankProperties; -import refinedstorage.RSUtils; -import refinedstorage.api.storage.AccessType; -import refinedstorage.api.storage.fluid.IFluidStorage; -import refinedstorage.api.util.IComparer; -import refinedstorage.apiimpl.API; -import refinedstorage.tile.config.IFilterable; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/refinedstorage/tile/externalstorage/ItemStorageDSU.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/ItemStorageDSU.java similarity index 94% rename from src/main/java/refinedstorage/tile/externalstorage/ItemStorageDSU.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/ItemStorageDSU.java index 74b6d2fd2..9a49fb3c8 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/ItemStorageDSU.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/ItemStorageDSU.java @@ -1,11 +1,11 @@ -package refinedstorage.tile.externalstorage; +package com.raoulvdberge.refinedstorage.tile.externalstorage; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.tile.config.IFilterable; import net.minecraft.item.ItemStack; import net.minecraftforge.items.ItemHandlerHelper; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; -import refinedstorage.api.storage.AccessType; -import refinedstorage.apiimpl.API; -import refinedstorage.tile.config.IFilterable; import javax.annotation.Nonnull; import java.util.Collections; diff --git a/src/main/java/refinedstorage/tile/externalstorage/ItemStorageDrawer.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/ItemStorageDrawer.java similarity index 92% rename from src/main/java/refinedstorage/tile/externalstorage/ItemStorageDrawer.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/ItemStorageDrawer.java index 8a6a39bfd..56ff4244e 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/ItemStorageDrawer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/ItemStorageDrawer.java @@ -1,12 +1,12 @@ -package refinedstorage.tile.externalstorage; +package com.raoulvdberge.refinedstorage.tile.externalstorage; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IVoidable; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.tile.config.IFilterable; import net.minecraft.item.ItemStack; import net.minecraftforge.items.ItemHandlerHelper; -import refinedstorage.api.storage.AccessType; -import refinedstorage.apiimpl.API; -import refinedstorage.tile.config.IFilterable; import java.util.Collections; import java.util.List; diff --git a/src/main/java/refinedstorage/tile/externalstorage/ItemStorageExternal.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/ItemStorageExternal.java similarity index 81% rename from src/main/java/refinedstorage/tile/externalstorage/ItemStorageExternal.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/ItemStorageExternal.java index a3b4b1181..46deebb88 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/ItemStorageExternal.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/ItemStorageExternal.java @@ -1,8 +1,8 @@ -package refinedstorage.tile.externalstorage; +package com.raoulvdberge.refinedstorage.tile.externalstorage; +import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorage; +import com.raoulvdberge.refinedstorage.apiimpl.API; import net.minecraft.item.ItemStack; -import refinedstorage.api.storage.item.IItemStorage; -import refinedstorage.apiimpl.API; import java.util.List; diff --git a/src/main/java/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java similarity index 92% rename from src/main/java/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java index 9d259f3c5..71290f359 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java @@ -1,11 +1,11 @@ -package refinedstorage.tile.externalstorage; +package com.raoulvdberge.refinedstorage.tile.externalstorage; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.tile.config.IFilterable; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; -import refinedstorage.api.storage.AccessType; -import refinedstorage.apiimpl.API; -import refinedstorage.tile.config.IFilterable; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/TileExternalStorage.java similarity index 90% rename from src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/TileExternalStorage.java index 5d1132deb..f369d9f8c 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/TileExternalStorage.java @@ -1,7 +1,23 @@ -package refinedstorage.tile.externalstorage; +package com.raoulvdberge.refinedstorage.tile.externalstorage; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorage; +import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorageProvider; +import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorage; +import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorageProvider; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid; +import com.raoulvdberge.refinedstorage.tile.IStorageGui; +import com.raoulvdberge.refinedstorage.tile.TileMultipartNode; +import com.raoulvdberge.refinedstorage.tile.config.*; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import mcmultipart.microblock.IMicroblock; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataSerializers; @@ -10,22 +26,6 @@ import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.items.IItemHandler; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; -import refinedstorage.RS; -import refinedstorage.RSUtils; -import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.storage.AccessType; -import refinedstorage.api.storage.fluid.IFluidStorage; -import refinedstorage.api.storage.fluid.IFluidStorageProvider; -import refinedstorage.api.storage.item.IItemStorage; -import refinedstorage.api.storage.item.IItemStorageProvider; -import refinedstorage.api.util.IComparer; -import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.inventory.ItemHandlerFluid; -import refinedstorage.tile.IStorageGui; -import refinedstorage.tile.TileMultipartNode; -import refinedstorage.tile.config.*; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.TileDataParameter; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/refinedstorage/tile/grid/IGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/IGrid.java similarity index 61% rename from src/main/java/refinedstorage/tile/grid/IGrid.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/grid/IGrid.java index 56bfd38ec..a1da8bfd7 100755 --- a/src/main/java/refinedstorage/tile/grid/IGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/IGrid.java @@ -1,12 +1,12 @@ -package refinedstorage.tile.grid; +package com.raoulvdberge.refinedstorage.tile.grid; +import com.raoulvdberge.refinedstorage.api.network.grid.IFluidGridHandler; +import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler; +import com.raoulvdberge.refinedstorage.block.EnumGridType; +import com.raoulvdberge.refinedstorage.gui.grid.GridFilteredItem; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.util.math.BlockPos; -import refinedstorage.api.network.grid.IFluidGridHandler; -import refinedstorage.api.network.grid.IItemGridHandler; -import refinedstorage.block.EnumGridType; -import refinedstorage.gui.grid.GridFilteredItem; -import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.tile.data.TileDataParameter; import java.util.List; diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/TileGrid.java similarity index 92% rename from src/main/java/refinedstorage/tile/grid/TileGrid.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/grid/TileGrid.java index 3d19194d5..65ace7a03 100755 --- a/src/main/java/refinedstorage/tile/grid/TileGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/TileGrid.java @@ -1,5 +1,26 @@ -package refinedstorage.tile.grid; +package com.raoulvdberge.refinedstorage.tile.grid; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.network.grid.IFluidGridHandler; +import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler; +import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.block.BlockGrid; +import com.raoulvdberge.refinedstorage.block.EnumGridType; +import com.raoulvdberge.refinedstorage.container.ContainerGrid; +import com.raoulvdberge.refinedstorage.gui.grid.GridFilteredItem; +import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerGridFilterInGrid; +import com.raoulvdberge.refinedstorage.inventory.ItemValidatorBasic; +import com.raoulvdberge.refinedstorage.item.ItemPattern; +import com.raoulvdberge.refinedstorage.tile.TileNode; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataConsumer; +import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer; +import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -13,27 +34,6 @@ import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.wrapper.CombinedInvWrapper; import net.minecraftforge.items.wrapper.InvWrapper; -import refinedstorage.RS; -import refinedstorage.RSBlocks; -import refinedstorage.RSItems; -import refinedstorage.RSUtils; -import refinedstorage.api.network.grid.IFluidGridHandler; -import refinedstorage.api.network.grid.IItemGridHandler; -import refinedstorage.apiimpl.API; -import refinedstorage.block.BlockGrid; -import refinedstorage.block.EnumGridType; -import refinedstorage.container.ContainerGrid; -import refinedstorage.gui.grid.GridFilteredItem; -import refinedstorage.gui.grid.GuiGrid; -import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.inventory.ItemHandlerGridFilterInGrid; -import refinedstorage.inventory.ItemValidatorBasic; -import refinedstorage.item.ItemPattern; -import refinedstorage.tile.TileNode; -import refinedstorage.tile.data.ITileDataConsumer; -import refinedstorage.tile.data.ITileDataProducer; -import refinedstorage.tile.data.TileDataManager; -import refinedstorage.tile.data.TileDataParameter; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java similarity index 85% rename from src/main/java/refinedstorage/tile/grid/WirelessGrid.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java index debc30453..101caac87 100755 --- a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java @@ -1,5 +1,18 @@ -package refinedstorage.tile.grid; +package com.raoulvdberge.refinedstorage.tile.grid; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSUtils; +import com.raoulvdberge.refinedstorage.api.network.grid.IFluidGridHandler; +import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler; +import com.raoulvdberge.refinedstorage.block.EnumGridType; +import com.raoulvdberge.refinedstorage.gui.grid.GridFilteredItem; +import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBasic; +import com.raoulvdberge.refinedstorage.inventory.ItemHandlerGridFilterInGrid; +import com.raoulvdberge.refinedstorage.item.ItemWirelessGrid; +import com.raoulvdberge.refinedstorage.network.MessageWirelessGridSettingsUpdate; +import com.raoulvdberge.refinedstorage.tile.TileController; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -9,19 +22,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; -import refinedstorage.RS; -import refinedstorage.RSUtils; -import refinedstorage.api.network.grid.IFluidGridHandler; -import refinedstorage.api.network.grid.IItemGridHandler; -import refinedstorage.block.EnumGridType; -import refinedstorage.gui.grid.GridFilteredItem; -import refinedstorage.gui.grid.GuiGrid; -import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.inventory.ItemHandlerGridFilterInGrid; -import refinedstorage.item.ItemWirelessGrid; -import refinedstorage.network.MessageWirelessGridSettingsUpdate; -import refinedstorage.tile.TileController; -import refinedstorage.tile.data.TileDataParameter; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/refinedstorage/api/render/IElementDrawer.java b/src/main/java/refinedstorage/api/render/IElementDrawer.java deleted file mode 100644 index f4c8f13b2..000000000 --- a/src/main/java/refinedstorage/api/render/IElementDrawer.java +++ /dev/null @@ -1,17 +0,0 @@ -package refinedstorage.api.render; - -import refinedstorage.api.autocrafting.preview.ICraftingPreviewElement; - -/** - * This {@link FunctionalInterface} is used to define a draw/render function - * This function use x and y coords and the element to be draw - * Usually packaged in a {@link IElementDrawers} - * Used in {@link ICraftingPreviewElement#draw(int, int, IElementDrawers)} and - * {@link refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement#draw(int, int, IElementDrawers)} - * - * @param The element to draw, usually {@link String}, {@link net.minecraft.item.ItemStack} or {@link net.minecraftforge.fluids.FluidStack} - */ -@FunctionalInterface -public interface IElementDrawer { - void draw(int x, int y, T element); -}